It's so close to the warranty date, its worth a call to Canon to see if you can send it in for free repair. I'd explain to them that you was hoping to upgrade sometime in the future, and this aggravation is making you think "Olympus" (wink wink).

Hopefully you can get it working yourself. Good luck!