We have an Olympus and a Nikon Coolpix. I would never buy a Nikon again either. Our Nikon was dropped just like your Canon was and we wound up with a lens problem too. Luckily it was still under warentee, so we had to send it to the company and they "fixed" it for free. It worked fine the first week. Then for no reason the lens started getting stuck again with a "lens error." We have to take the batteries out and put them back in to get the lens to close and solve the "lens error" problem.
The Olympus' only problem is that it's one with out a mic., so the videos are silent movies. Otherwise, it's a good little camera. Both cameras are slow shooters when taking pictures. What I don't like about the Olympus is that it only takes Olympus memory cards, which are very expensive. The Nikon uses a typical SD card.
I'm curious about the Fuji cameras. I had a 35mm and that thing works no matter what. It was dropped on a hard wood floor, so I have the battery compartment taped shut and it still works well. I'd like to get a Fuji digital camera, which one of my friends swears by. She loves all Fujis. I've noticed they have a water proof one as well and they look cool.