FYI for the celcius impaired, 5 degrees C is 42 degrees F.
I would agree with the warm water in the suit approach but would suggest using water no warmer than normal skin temp - about 87 degrees. Water hotter than that will expand the capilaries and will direct more blood to the surface of your skin and will ultimately promote more rapid cooling. If the water feels warm, it is actually too warm. You will feel great intiially, but that effect is transient and does you more harm in the long run. You want to fill the suit with water that is close to skin temp to prevent your body from having to warm the 42 degree water that enters instead, but don't overdo it.
A good fitting 7mm suit is a must as are 7mm boots and hood and you need at least 5mm gloves. 7mm three finger mitts will keep your fingers much warmer and your fingers are normnally the limiting factor in water that cold.
Between dives either remove the suit immediately or cover it up. Wet suits become big evaporative coolers out of the water and you need to limit the evaporation to stay warm. You can cover the wet suit with a waterproof rain suit and then put an overcoat for extra insulation over the top. In really cold air temps, evaporation is self limiting as the water freezes into ice on the suit. But in my experience, in those temps with a wet suit, one dive a day is more than enough.