Terry your advice on this thread is generous and extremely valuable! If the frustrated swimmers of the world realized the gold mine...in this thread alone...there'd be no more frustrated swimmers!
To the OP, trust the process and try Terry's suggestions. It may take you several weeks to go through them all and get them feeling right but it's the right path. Combined with help from your local TIncoach you'll be swimming the channel in no time