Finally got my new router working with WPA. (There was some sort of problem with Safari and the router, IE worked a little better, plus they hide the security setting on another page so the router lets you setup WPA all you want but if you don't choose it on that other page you're out of luck.)

I'll leave speed tests for another day.

Everything's working now (except for my work PC not working with Windows update, but that wasn't working with the old router so I'm not really worried about it.)