Seems like a big ask for two months of development.
I would rather have the ability to push this upgrade in the future, however, only if it reduced the Dash fee to 0.
That said, I would support this proposal as is.
I fully agree with this solution, and thank you @ThirtySix !!!