I'd upgrade your source first. Ayre's high end stuff is very, very good, but expensive. If you want to take one step at a time, then buy the best CD/SACD player that you can afford. Move up in preamp first.
SS is great and Ayre is one of the best. However, if you budget is limited, then tubes do tend to be more musical at the price range that your at. Still, I wouldn't replace any amplification equipment until you've really upgraded your source. Lots of nasty things happen in less expensive CDPs. Tubes can cover that up and smooth it, but not fix it. To fix it you need a better source, sorry to say.
Dave