I wholeheartedly recommend Terry Laughlin's Total Immersion technique. It emphasizes swimming like a fish, stroke length, low stroke count, zen-like being in the moment. The beginning drills emphasize basic buoyancy and balance techniques - and the arm propeller-based swimmers will look at you strange when you practice them in a public pool - but keep with it, you will lower your stroke count and eventually enjoy swimming for fitness.