Feels a little complicated for what it achieves, especially for Extra Attack.
Not rules I would use myself, but from what I can tell, it seems to work well for you. So here’s hoping you and your table get many sessions of enjoyment from it!