Wi-Fi Sync Issues Since 10.18

I've been on all the beta firmwares, and since the 10.18 upgrade none of my rides uploaded. Had to turn off wifi and do a bluetooth sync. Removed the network and re-added, same problem. If I go to system -> about -> check for updates, it says "Transfer already in progress", but of course nothing is happening on the device. In connected features / wifi, "Wi-Fi Sync" says "connecting" - but never connects.

Checked the leases on my router, and it seems that when the unit wakes up from sleep, it's isn't renewing the lease, but wifi isn't working. A full power off / power on is required to fix wifi and sync again.