Do not upgrade components until you've exhausted the many options of room acoustic treatments.
The absolute best advice anyone could give you. For, when you've finally achieved great sound with your existing components, you'll get even better sound with further components.