I also have tons of photos and iPhoto wasn't working properly. It must be the worst application by Apple. I've been using iView Media Pro and it works pretty well, even though the interface is not that pretty. I've also heard great things about Photo Mechanic. Good luck!