Like other's have said, wetsuit for 40F sounds a bit crazy to me, but if I was to scale it up to "my definition" of cold, which is more on the range of "anything lower than seventy-a-lot"
I've discovered that it may be nice to get out of a cold wet wetsuit but is torture to put on that same wet wetsuit.
I may do it on special occasions, but if it is going to become a routine I will have 2 wetsuits and for the 2nd dive I will put on a dry wetsuit.
Really I've decided that tolerating cold is not for me, but before reaching this decision, I found that a good wind-proof boat coat makes a huge difference, making sure is long (around knee length). If the vessel doesn't have a way to heat something (propane grill/stove,microwave or similar) then TWO thermos, one with strong dark chocolate homemade beverage, not just hot water with some powder, the real thing. The 2nd thermos with fatty broth, made out of whatever creature you like best (chicken-fish-caw-sheep-your/favorite) that broth I'd take it as is, or use it to cook thin noodles, the kind that takes only 3minutes or so.
I no longer eat much carbs, or use a wet suit when temperatures drop, and have a heater in the boat. But I still take thermos with me for the surface intervals if the plan calls for more than one dive.