Are you paying attention to the small things?
speaker placement, seating position, furniture in the room,
wall and floor challenges? What about cabling and attention
to vibration control, for each and every piece?
Instead of chasing the holy grail by changing components,
you might want to focus on getting the most from the
main pieces that you already own. (This is cheaper and more fun.) Have you read Jim Smith's "Get Better Sound?"