Higher-rate saver
Model the smaller PSA and avoid treating it as a deduction from income.
Decision boundary
Use one tax year's actual non-savings income, taxable interest and dividends. Confirm current allowances and mixed-band treatment before filing.