My advice would be to listen to the speakers for 3 to 6 months and then decide what, if anything, needs changed. I think just shopping for "better" components, without clear goals, is a merry-go-round of wasted time and money.