I'd upgrade the pre. I'd go with the XP-22 and use the money that you would have spent on the XP-30 and get the best power cord you can afford for it.
You need to hear the .8 series amp. You can search for reviews to get a sense of what it does differently from the .5 series.
In any case, I think you'll yield more by upgrading your preamp.