Figured it out...here's what I did:
Uninstalled the JMicron AHCI driver, restarted, reinstalled the driver, restarted.
The drive Q disappeared from Windows, so I restarted again, this time I unplugged the drive and plugged it back in before Windows booted. My drive magically was detected and everything was restored even the correct drive letter. Not sure what local disk Q is, its still listed in My Computer but its inaccessible. Very weird.