Don't rule out Aperture, no matter what the naysayers say.
Define ditching. While they may no longer support or improve it, we will still be able to use well into the future. I find it to be the only editor I need except for Tonality, which I use for b & w conversions.