Not a fix, but a workaround...
I set up a pptp vpn on my router.
Android has built in vpn capability, so I just vpn into my home network and connect "locally" to the server. This works even on 3g.
Not ideal, but at least I get to use the server.
Edit: sgs 2 using ICS