I been flying with WTM for a few months now and can definitely attest to the awesomeness of the experience.
For me upgrading the MWD made the biggest quality of life difference, so consider actually upgrading MWD before upgrading to a Vindicator.
I realize that it seems like a large investment, but given the isk generated by a standing fleet, it is very doable in a relatively short period.
Additionally check out the implant guide, there are couple implants that will help with capacitor issues as well.