Easier said than done. Please take my word for it as regarding me.
As for nav skills, well, actually my nav skills are pretty good for normal diving. It's just when lobster hunting that it's a bit more difficult. Also, the areas I've been frequenting present real dive challenges. Say a rocky area shaped like a sombrero between 75 and 105 feet... at night. I hate wondering where I am from the boat. I like to dive at San Nicolus Island and Talcot Shoal. You can make four long swims in a day. Getting three out of four is not good enough. Want four out of four. It used to be that a 1/2 mile swim to the boat was only an inconvenience. Now it's a nuisance. .... "even more years" you say. I got 40 years so far.... we'll see about the future, but it is certainly time to make the swimming easier.
Enjoy the diving, Mike