Hi Christiana, sorry, no idea about the yoga.
I haven't done any aquafit classes in Edinburgh, but did some in West Lothain 3.5yrs ago. They were a bit rubbish tbh, just going for a swim myself would have been more beneficial I think! But I guess it will depend on who is running the class