Chocobo Request: Enable/Disable abilities

I like the chocobo companion, and look forward to continuing to level him up in 2.3.

However, one small problem with him is that I may not want him to use certain abilities all the time. For instance, I may be fighting a monster where I want to stun specific abilities (the Molboro monster that spawns from Alexandrite chests, for instance). In this case I would not want the chocobo to use his stun move or the monster will become immune when I wish to stun them. For now, I can just get around him by forcing him into Tank or Healer stance, but ideally, I'd like him to be able to use the rest of his DPS moves, and just toggle off the stun before that fight.

Would it be possible to have a simple toggle on/off for chocobo moves we've already purchased? Wouldn't even have to change the UI much, you could just click directly on abilities you've already purchased to enable/disable them.