I would say your best plan, moving forward, would be to always max out your RRSP if you don't need the cash. Then move onto maxing out the TFSA and only then invest in the non-registered accounts.
I have a somewhat differing opinion, at least for now. Assuming tax rates both at the time of deposit and withdrawal are the same and all of the RRSP refunds are also put into the RRSP, an RRSP and a TFSA will work out to pretty much the same future value. (If the refunds aren't also put into the RRSP, the TFSA will have the higher future value). Since the original poster indicated he expected his tax rates to remain the same, it is the side benefits that will really make the difference.
If the original poster hasn't bought a home yet and intends to do so, then I would say deposit into the RRSP until you hit the maximum that you can withdraw under the home buyer's plan (I believe it's been raised to $25,000 but I'm not sure on that). That gives you the tax credit and the use of the money, even if you do have to slowly put it back over time.
Once that goal is met though, I'd put all of the rest into the TFSA until capped and then put into the RRSP, because in the long run the returns would be basically the same, but the TFSA can also be your emergency fund. The problem with using the RRSP as an emergency fund is that once you withdraw the money, not only do you have to give back the refund (magnifying the costs at a bad time), but you can never re-contribute that money again. With the TFSA, you can.
Finally, in terms of retirement, if you're planning an income of around $40,000 clawbacks of OAS and the like may not be an issue... unless demographics make the government tighten it up and leave the limit low as inflation creeps up over the years. To get $40,000 today, assuming $10,000 from the CPP, you'd need to withdraw $37,500 @ 20% taxes from the RRSP and you'd show a taxable income of $47,500. If you withdraw $30,000 from the TFSA, you're showing a taxable income of $10,000. Personally, that's why I like the TFSA best... because while it may not be an issue, I hope I do well enough that it is
All that said, this is just a differing opinion and there may be other factors that make the RRSP superior in your case... for example, the tax treaty with the states to avoid the withholding taxes doesn't apply to TFSA's yet, so american stocks might be better held in the RRSP than the TFSA. Or you may have already opened the brokerage account in the RRSP so may want to keep putting contributions there until it grows to the point that you aren't paying annual fees any more.
No matter which way you decide, both the RRSP and TFSA are winners and you can't go wrong with either of them.