Seems like completely wiping my router settings worked in the end.