You are going in the right direction.

I think its more :

if your taxable income during OR post-office exceeds (some 1,3,5 yr average) prior high watermark income, or the officeholder's salary (whichever is higher), every penny over high watermark is taxed at 99% tax rate.

That should take care of those pesky "speaking fees" and other nonsense that makes politicians rich.