Mixermanic-
There is no point keeping your XP10 if you get the XP30 as the latter is so much more flexible!
The XP/TR combination is good as Roland and Korg sounds complement each other very nicely indeed. The XP's display is not that bad (and that is coming from someone who is vision impaired!!!!) and the extra session etc sounds are great (as you already know).
Another option so check out is the new Yamaha S30 synthe. This has a 'Yamaha' sound as opposed to a 'Roland' sound but after playing it's big brother the S80 the other week, I would seriously consider comparing it to the XP before parting with your hard earned cash!
In the end however, the XP is a great instrument. Enjoy making music!!!!