Well, with you permission i can do some changes...( i wait for answer on this)
Also, i have an idea of how to get the student swim on deep water, but i'll just test that in one of my own maps first.
Edit: It worked, all you need is the invisible platform, but you have to try how much up from the bottom it must be.