Okay, I think I am going to go to Cloud Generation for Aqua and do Chakrams for Maeve. 

Those just seem to be the right way to go.