tried using a raft? that's what i do. (only use i have ever had for the raft lol)

Raise the under water ground level, put walls ontop of it.
Quick heads up, enemies have no stamina so the will still swim around.