I would get familiar with Lightroom/Photoshop before I invested in additional gear. Software has come leaps and bounds recently and many of the issues you wish to see improved may actually be addressed with proper post processing techniques. I think this is critical given the photography you do.
Best of luck,
Bob