^^^Good post Cecil and I have to say good planning (and self-control !) on your part.
With respect to the CPP, agreed it will not be enough for most people to retire on, but the 1997 changes look to have been successful and the fund is sustainable:
http://www.oirpc.ca/faqs.html