I think you should upgrade now.Windows XP is the best OS right now.
Before I hate XP.But after MS have fixed the bugs of the OS,I've finally decided to change my OS.