One thing not talked about is that high waders and dry suits can form an air pocket at the foot end, lifting your feet up and unless wearing a good pfd or life jacket, your head goes down. Makes swimming more tiring.
Whatever option you decide on I recommend practicing a capsize and swim plus...