Well, I decided to hold off on any drastic changes right this moment and ordered a 12/25 cassette this evening to try out for a couple weeks. We'll see how it goes.

Thanks to everyone for the responses and advice!