The choice is really only one you can make. I'd say if you are planning on replacing the PC in the near future (like others in the office), waiting may be the way to go. If you are planning on holding on to the computer, upgrading is the way to go. Before upgrading it is a good idea to run the Upgrade Advisor to be sure the computer is equipped to run Windows 7.
Microsoft Windows Outreach