Going to try and reinstall Windows again when I have some extra time to see if that resolves any issues.
Reinstalled Windows last night, this time from an ISO mounted to a usb stick... last time I did a local reinstall. So that eliminates that as a factor... really need this to be fixed, it's severely effecting the amount of volume I can put in.