What would be your ideal solution?

Agreed that reduced experience is annoying... one thing that hits me is that I can't have enough sats in there to automatically renew my territory fees.