Yea UPNP is on,
The old router, the Dlink Dir 615, I had DD-Wrt running on it and I had it setup beautifully, however I wanted gigabit network speeds to go with my other gigabit devices (NAS, TV, Mac, Switch, Laptop when using LAN) I could put DD-wrt on my new wndr4500 but its buggy and still in development.
At the moment I can not see any improvement with the gigabit.
As said previously, the network ive setup at work, is brilliant.