Still having anxiety underwater after multiple dives?

I took my Wave 1 course back in January and have dove another six times after and have yet to pass. I hit 11m on my most recent attempt, which is pretty huge considering I didn’t get more than maybe 2-3m my first dive because of EQ issues.

I’ve been using the STAmina app to work on breath holds and I’ve got a mental distraction I use. When I’m on land, everything feels great, but when I’m underwater, it’s harder to stay distracted and I panic a lot sooner.

Between now and my next dive, my plan is to keep doing what I’m doing but maybe add in some meditation and breath holds in a pool (with a friend). Does anyone have any suggestions or tips that helped you overcome anxiety and panic underwater? Anything is greatly appreciated!