Nathymoore,
To your question of X1 or X2 : I would recommend X2 directly, because for me, X2 is really an updated X1 with more/updated features.
Because it's new, it also has some new (and old) bugs to be updated. But none of these are going to stop you from using X2 effectively.
If budget is your concern and you're not in a hurry, keep using your LE first, and see what special offers you may get during the holiday season ? At this moment, all pricing at the Cake store seems to be at it's regular top.