Are you using a Henderson Aqua Lock by any chance. Those things are as close to a dry suit as you can get in a standard wetsuit. I can see being able to get away with the 5mm if your dives aren’t to long or your depth isn’t to deep. Maybe a shorty for your core for those times you know the water is going to be colder because of the depth of the dive.