Uncapping income it is applied to and throwing in capital gains would totally solve the problem if you sever the link between contributions and payout (which is a form of means testing).
Edit: I didn't realize dividend income was not subject to payroll taxes.