With a government pension, give some thought to whether RRSP or TFSA might be the better vehicle for the bulk of your individual retirement savings.
The rule seems to be that if your income is lower in retirement than in your working years, you are better off with RRSP. However, you might just have the opposite situation.
Combine a comfortable pension plan (70% of best 5 years?), CPP/OAS (albeit you're likely to see some clawbacks here), an RRSP fund that could be large given your track record to date (healthy amount for your age), and you could be looking at a taxable income very comparable to your working years.
Anyway, just a comment to give some thought to whether a TFSA might be a good vehicle for you, given your potential retirement income streams.