Remember, you can apply for a visitor extension, without having to leave.
You're in the CIC system, so you can do it online, just make sure it's at least 1 month before the expiry date. We weren't yet and had to do it via snail mail, in which case, 2 months is a good idea. I'm still waiting to...