To the OP,
If you are still undecided, I would seriously consider submersibles. Much of the technology is similar to aviation. The defense contractors such as GD, Boeing and Lockheed are big into them, and will be for a long time. There are many problems to solve, issues to address and associated R&D. There would be plenty to keep you challenged. That would be my best recommendation at this point...