Agree, for a stockish fun play ride purpose spending more money and time won't payback. If an XS is being modded for competition perhaps more money invested in performance could be justified. A first XS play bike? I'd encourage that to get to a nice running condition before bigger and more costly decisions are made. A slightly modded stock XS is quite a pleasurable ride.
-R
-R