Soo it's been three years since the above post, update as follows:
As mentioned above in the second last sentence, I moved my BI5 to a 970 EVO Plus 1TB NVME drive in a HP EliteDesk G5 desktop case September 8th, 2022.
Confirming this is still exactly the same machine, Win10 OS install and NVME...