Just a quick note. If you haven't check out a company named Solarwinds I would suggest it. I've used their Orion server based network monitoring tools for about 3 years now. It just keeps getting better and when you look at the price when compared to some of the others out there it can't be bet.
Also look at their pro tools and check out WAN Killer tool. If you need to generate network traffic for your WAN testing, this is a nice tool.