I'd join a masters team now -- that way you'll have plenty of time to improve your swimming. Also, consider getting a pair of fins (swimmers fins). They will help you with not only your body position, but your breathing.

Check the USMS site for programs near you