I should clarify the issue with the switch panel...
I bought a used 3 switch panel off another forum member. When I went to install it in my Heep I found that the plugs on the back of the lighter sockets were different. I *could* have cut the wiring and crimped on individual Fastons but I hate doing that.
So I thought I would just cut out the hole in my original panel and move over the switch. Won't work - the plastic that the latches on the switch snap into to hold it in place aren't there on the two switch panel.
Then I thought I would just take the three switch panel and remove the two lighter sockets and move over the ones from my original panel. That won't work either - there's little notches in the holes to keep the sockets from rotating and they're in different places. I could have started modifying stuff but I just hopped on eBay and bought a three switch panel with the same style lighter sockets as my '99.
I have not researched this thoroughly nor do I know what year the other panel I have is so I don't know when they changed, but if you are interested in it I can dig it out and shoot some pics of the backside of it to compare with yours (not hard to remove, you just pull off the center surround and remove a couple screws and it comes right out.)