So I have had the same battle off and on for awhile. I finally took some lessons and adjusted the settings on my driver to where I prioritized in the fairway over distance. I also moved to a set of tees where I have a 7i or below for most of my approach shots. I have also prioritized enjoying the game over my ego. Whichever way you go just remember it's your game, your swing, have fun.