Definitely, get a 5mm full sut. If you were cold previously, you'll need it. If you look at the DM's and Instructors, you'll see they wear 5mm or 7mm suits. True, they do a lot more diving everyday, but you won't feel like you're out of place with a heavy wet suit.
Also, if you're warm, you...