It is not that simple sometimes eg. Cauldron/Shotgun in Komodo.Best advice you have already. Embrace the current, it beats using flippers.
Any decent dive op or liveaboard will place a pickup boat exactly above your head.
Fall in. Get neutral. Relax and take the ride.
If you’re swimming against it, you’re doing it wrong.