Confronted with the same sort of problem, I ended up with Capture One and couldn't be happier. There are other options out there, which you should definitely explore.