It all seems to be working now, I had to factory reset both which I did before but this time I did it with them both connected and it seems to have worked.
Would you disable firewall, upnp, security on the isp router which is between the R1 and modem?