I would never install any OS, even on the same machine and the same OS without doing a clean install. Certainly not over a previous version such as XP.
You are correct, it is a lot of work, but there are ways to clone hard drives using the correct software. But, I definitely wouldn't just upgrade to WIN 7 to try to fix the problem. There is no guarantee that it will.