Couple things you can do, #1 and the easiest and makes the most difference is ditch the tail glue and use 3M adhesive, comes in the big black can, I think it's for gluing wall board or something on, horrendous stuff but boy will it make a great tail.
#2 One trick would be take a zip tie and pull it as tight as humanly possible about 5" down from her tail head, it will swell a bit and likely is similar to when you sleep on your arm and wake up and it's numb and dead feeling, often stops them from swishing so much. Clip the sip tie off right after your class and ther will be no ill effects.
Also if you clip the long loose piece off the zip tie it is fairly unnoticable whlie on the calf in the ring.