Versatile weapon damage scales improperly for monks

If I wield a versatile weapon, for example a quarterstaff, the damage die should either be 1d6/1d8 OR my Monk damage die.

Instead, the character sheet shows the Monk damage die, or one size larger. For example, at 20th level the damage was either 1d10 or 1d12. Jeremy Crawford clarified on Sage Advice that a versatile weapon does not allow damage to be one did larger than the Monk die when wielding it two hands: https://www.sageadvice.eu/2017/01/22/a-monk-using-a-quaterstaff-does-versatile-die-go-up-to-a-d10/

It might be useful to show all three options (one handed, two handed, Monk die) in such cases as well, but not sure how cluttered that will look.