Yea, I like the Extra Move and Extra Standard implementation of it, and making each of them a free action. This should prevent the limited action abuses (Kiai!), and encourages current amount of Devil Trigger (3 rounds of Devil Trigger for 2 full round Devil Trigger turns).