Hello @jbatt,
I had the same problem and I was able to solve it in the following way:
sudo nano /etc/systemd/system/network-online.target.wants/networking.service
In this file change line
TimeoutStartSec=5min
to
TimeoutStartSec=10sec
Source: https://ubuntuforums.org/archive/index.php/t-2341447.html