Link the state pension to the income tax allowance and capital gains (and revise national insurance the same) so that its very straight forward.

You get X a year in tax free income, regardless of source, and everything over that you get progressively taxed on.