So what happens when you connect/disconnect the drive while Windows is running?
Personally, I don't use AHCI. Rather, I use PCI / PCI-E SATA disk controller cards running Silicon Image disk controllers and their drivers. These hot-swap perfectly, but don't give a "Safely Remove Disk" option. I just pull them after I'm sure the writes are done.
I'm not suggesting that you follow this option. I'm just wondering if Windows freezes when you add or remove disks. If hot-swap is working, then Windows won't freeze and the disk be addeded or removed, as appropriate, from Explorer and Disk Management. If hot-swap isn't working....you'll know it. The disk won't appear, and if it's already installed it'll likely freeze Windows when the drive is disconnected.