This is extremely relevant for me, thank you.
I've just picked up some cheap heattech ultra thermal underwear from Uniqlo, which my always-cold girlfriend swears by, for a couple of cold destination non-diving trips and will give these a try. Wicks sweat, made of much of the same stuff as purpose scuba undergarments, should be suitable.
Top: Sharkskin + heattech ultra long sleeve shirt over the top
Bottom: Heattech extra warm + Heattech ultra warm long johns layered on top of each other
That gives me a starting point, with the ability to peel one layer off top or bottom, depending on how things go. I could imagine that just one of the heattech layers would suffice when it gets a few degrees warmer.