Maybe you should consider a dry suit. You will be warm before, during and after without having to dump hot water down your suit. You could even change between dives and suit back up without having to put on a wet and cold suit.
Good luck in whatever choice you make.
Good luck in whatever choice you make.