It’s sharp! For real, I might just do it your way (with credit etc etc).
Mine is/was to have two separate common move sets and the ability to move between them at the cost of running up the stress/transform. Mostly it’s just too damn many common moves to track, like more than 10 (I think 8 is probably the most there “should” be).