Also increase the contribution limits to the hard maximum including employer contributions (e.g. $64.5k/yr) or eliminate them entirely then just cap the maximum post-tax value of your total tax advantaged accounts and require payouts above the caps.
The maximum value cap should be indexed to your age (and inflation), such that the maximum allowed is enough that if left alone can support a very well funded retirement anywhere in the country with very high probability.
