OP,
Thanks for sharing your system. After giving it a little thought. The speakers are the most important choice in your system and largely determine the sound quality of a well balanced system (that is cost effective). Typically the speakers are the first choice and then all the supporting electronics are chosen. I recommend this approach.
Do you speakers sound ideal? If so, swap our your electronics to get the best sound out of them. They are pretty old. Perhaps auditioning speakers makes more sense. You want to find speakers that sound right to you… that you have an emotional connection to. Then, if necessary, swap out the electronics to get the perfect sound out of them. This is the shortest route to having a system that perfectly reflects your sonic values.
I would spend time auditioning speakers, until you find some that really connect with your emotional center. If tears come to your eyes… buy them… then optimize your electronics.