Do you do you pool/training swims with people around? I've been jumping in the 'fast' lane and even though I might bug the crap out of some folks I find it is helping me control my own pace and un-learning the natural desire to "race" everyone around me...so I just go out steady and controlled and let them swim around me, I figure this will help long term...
Good luck.