Thats indeed what I'm using.If the OP can show me how he reassembles the scap and fd files with the correct checksums so that they pass all the self-checking as the EFI loads, I can show him how to add and remove different EFI volumes from other machines' firmware. He just needs to explain what tools he's using and what steps he's taking.
Edit: I'm assuming he used IDA Pro with EFI plugins to disassemble the firmware and identify where the NVMe code was. Adding native NTFS and support for other disk formats, and upgrading to the latest USB spec and microcode update should be trivial compared to what he's trying to do - reassembling a working EFI was the stumbling block, which he seems to have overcome.