It might not be a bad idea to have a little bit more coaching too. Obviously it will improve your swimming and your confidence in your abilities, but it also gives you more knowledge of technique stuff you can focus on instead of the thoughts you don't want to be thinking. Maybe it will be less effective in a panic/fear situation, but I find that focus very handy for getting the "this is hard/I'm tired/why am I doing this?" thoughts out of the way.
Drink coffee and do stupid things faster with more energy.