Upon discussing with the council, we've come to a more in-depth definition of how we'd like moves like Taunt, Encore, Trick, Knock Off, Skill Swap etc to function.
Disclaimer: this is only based on what we, personally, would prefer, but the actual implementation will be the one that's easiest...