First before recommending any thing, get your body into the water to find out what needs preserving.

In addition to what Dean said for short term immersion in 50+degrees, neoprene vest (to prevent flushing of water around torso), neoprene gloves,neoprene hood,beanie,or fuzzy/rubbery beanie. Fuzzy/rubbery long sleeve shirts, Sealskin waterproof/breathable socks are great(as long as your're not swimming,and are wearing liner socks) get the over calf size.

one of the factors in picking appropriate clothing,from your experience, is whether you're wearing something for duration of a likely self/rescue scenario or longterm immersion. Any long term immersion scenario has to have a hood and means to prevent cold water from torso,that's why farmer john and paddling jacket are limited for long term immersion,even a dry top lets water in through the back.

56cm Bottechia