I like this. An issue with the original is that an awful lot of stuff can happen between two turns. As you say, there could be a lot of bookkeeping. This is more elegant.
But are you both confusing round with turn? Remember that a turn can be an Action, a Bonus action, a Reaction, a move, or a...