Hi, i had the same problem, and i was fiddling around with the router all day... untill i stuffed up the settings... so i re-set the router and made a new connection, and now everything works fine.
I have the same router and i had to do this. Make sure your router's channel is 11 or 1 if I can remember. Before I changed it, it would disconnect then after awhile it would reconnect so I changed the channel to 11 and now it works perfectly.