I've got a MK2 dash in my ZR. It is quite an easy job to do as it bolts in all the same places.
Glad to see you got the heater controlls as they are different. Have you got any wires and connectors for the switches ?
What my dad came up with the idea of doing was to use the existing switches but put the cover off the new ones over the top. It actually looks quite good, they just stick out a little further but they still light up.