Layering is a tried and true concept. If you're using your 5mm fullsuit as the main layer, there are two additional layers possible that you could think about:
1. A hooded vest underneath -- a 3mm vest thickness + 5 or 6.5mm hood thickness could work pretty well. You'd probably want to get a slick-skin version of this.
2. A 5 or 6.5mm sleeveless step-in jacket over your fullsuit. Certainly, your existing 3mm shorty could work if it's not too tight (i.e. it fits on top of your 5mm, rather than squishing it down. Usually, though, top layers are not back zippered, as I would guess your shorty is, though I'm not sure if that's problematic or not. Top layers are usually also sleeveless, I think to ease donning).
-Simon