Why not simply allow voluntary payments into CPP to top up a pension?  The bureaucracy already exists and the government could still make a reasonable profit to fund the program.  Given the choice between an annuity and being able to increase my COP benefit I would choose the latter.