Sounds like your doing all the right things. The program that you are starting, floating on your back I suspect is a relatively new, within the last few years, I can't think of the name of it. It's a middle eastern principle of quiet relaxed range of motion exercises done floating on your back with the aide of an instructor one on one. This is a great program. I'm digging into my old pool files trying to find it. I was going to impliment it into our new pool programming when I worked at the other facility. Water Ai Chi is also another good program, it works range of motion, balance, and strunk stabilization.
Good luck with your programs and let me know how things are going.
Cindy