I think I understand what you're saying about the amp, but it wouldn't cost that much to do better by buying something from an amp manufacturer. The difference between your Yamaha and say an, Aragon for instance would be night and day. I'm sure you would find the 8008st to be a huge improvement, for not a lot of money.
For speakers I would suggest a pair of the Sony SS M7 or if you can the SS M9. They can be absolutely stolen for $500-1500 respectively. They are American designed and made. If they had any other label on them they would sell from twice to three times what they do now.
Everyone who responds will have different suggestions. Yours, grasshopper is the responsibility of taking all the abuse and suggestions and doing something good with them.

