Bill, the solution to  your problem is simply to give all tax payers an ability to save on a tax deferred basis (more RRSP room) the same that is available to public sector workers. As you said yourself back in 2013 "Someone who understands this impending crisis is federal Finance Minister Bill Morneau. In 2013, when he was still head of human resources firm Morneau Shepell, he laid out the inevitabilities of the coming pension crisis in a speech in Fredericton, N.B. “Who believes that the average Canadian, without a defined benefit plan . . . will, over the long term, agree to continue to fund public sector employees’ pensions at a level that they can only dream about attaining themselves?” he asked. “It’s older public sector workers versus everyone else.”