Spot on, to remove you remove radio first, then unscrew two screws, then carefully with a flat head driver pop out the two brass retaining clips which are at the top of the console. You will hear a click as the pop out. Put a cloth over the screwdriver head so as not to mark the leather surround.
Once the console is loose you can unplug the plugs off the back of each control unit.
Just had a look at my old unit and the bulbs are very much soldered onto the Pcb as shown in the pics below. I cannot find a way of popping the bulbs out of the holder!
You are welcome to try the PCB on yours.
Control unit for heater.
Unit dismantled showing the back of the PCB with bulb holders shown.
PCB side showing back of bulbs.