2.5.4 UPNP says succeeded but didn't really

Running 2.5.4 in windows 7 64bit, the log shows succeeded but ed2k only gets low id, and g2 sources never connect after waiting 2 hours. Manually forwarding ports in the router and disabling upnp worked to get high ID but never got a connection on any g2 sources. Router is a D-Link DIR-632 connected by wire if that makes any difference. Any known work arounds, or should I keep using 2.5.3?