I would like :
AF back and needed for trances again, but with a charge of 2 to eliminate this "gate" feeling
Bahamut Trance and Bahamut merged to work like phoenix. That way you only have 2 steps to do in a minute : stacks expenditure, then 20 sec trance.

That would streamline and remove some clunkyness, but it would indeed extend ruin spam time. Maybe put AF on 45 secs ?