You must surely have more than 15gb of hard drive space?
I got a cracking deal from the Dell outlet last year, and have used it a few times since then for a netbook for myself and for a few machines for other people.
Basic rules - no celerons, 3gb ram, and get Windows 7.
And yes it probably is a waste of money upgrading the current one.