I'm back at the property this week and despite clicking on "Forget My Device" two weeks ago, all of my devices continue to be in One-Click. The URL for the "Forget My Device" link contains the MAC address of my devices, so that's confirmation they're using the MAC address for tracking. The Upgrade to Enhanced Internet link (http://internetupgrade.marriott.com/) still does not work, but this week instead of timing out it just keeps redirecting back to itself without giving me the option to upgrade. I went ahead and clicked on "Forget My Device" on all of my devices again this week, but I'm not optimistic that it'll make a difference when I'm back next week. If anything changes, I'll post an update.

Since I'll be at this property almost every week for the next year, I bought a TP-Link TL-WR802N router, and that seems to work extremely well. I'm able to connect the TL-WR802N to the Enhanced Internet (via Wi-Fi), and then connect all my devices via Wi-Fi to the TL-WR802N. If anyone reading this is wondering if they should enroll in One-Click, then my advice would be "If you want to use Enhanced Internet, do not enroll in One-Click."