was ... the back and forth current, or both. Has anyone else experienced this?
This! Yes! Waves and surge suck.
Fortunately, our final two certification dives are in a reservoir so I imagine I won't have this problem again. But it sucks if, every time I dive in the ocean, I get sick once I'm under.
You do have a future in ice and cave diving. No waves is assured!
ps. if you experience any waves in a cave then you will have much much bigger problems than cave diving!