Although it seems from your photos that mine may not be original, on my 1966 plus 4 the heater switch is where your choke is and the screen washer is a fourth (spring loaded) toggle switch, so I have two switches either side of the power feed.
My choke pull is attached to the steering column on a bracket, so there are no switches fixed directly through the dashboard.
Malcolm T
