Many good suggestions here, with Baron's being your best bet...As a lifeguard and Masters Swimmer
myself, get yourself some short 'Training Swim Fins'...they'll help you relax as you do longer swims...and you'll still be able to do flip turns as you advance ;-)