Been looking at the Bosch ones but they don't have the same appearance (my wants exceed my budget)
short term plan will be a headlight switch with the cap changed to the orange/brown fog light switch type (from germanjunkies).
(typically one sold on eBay last weekend for a sensible price).
Head light switch give sort of correct switch operation (2 positions = off, on, on operation).
Common the supplies and link back to original headlight power out from orig switch.
2 relays req, one for front and one for rear switched from the switches 2 outputs.
Works in my head, just to try it on the bench before attacking the car.