Mando, I put the headlight and wiper switching on the dash. Ive flipped the barina indicator stalks around, and just left the indicator stalk (so its on the left as I wasnt happy with the clearance with the door on the right) . I turned up a slimmer stalk that slides over the barina one - and it only controls indicators and high beams, not headlights. I made a slightly slimmer shroud out of fibreglass that only has the hole for the one stalk. It does fit in the hole even with the leather, although Im not sure on what to finish it with. I had painted it the alumnium colour, but am thinking it might look better wrapped in leather too, which would make it really snug fit.
You can sorta see the new stalk and shroud in this old pic:
The five switches on the dash are heater\fan, windscreen washers, wipers, headlights and hazard. The orange light nest to the temp is engine check light (MIL)- everything else looks pretty much the same as yours.