Process for UEFI only images (7060s) - using old wim

My normal process is to just boot legacy with a Dell IA bootable thumb drive and flip back to UEFI boot after that.  Or use a PXE legacy boot option.  This doesn't work on the Optiplex 7060s.

Now... you need Fat32 formatted drives to work with UEFI..note the 4GB limit here, so I now need 2x thumb drives to accomplish this, which is annoying, but workable.  I tried to boot to the UEFI thumb drive and restore the old image I captured, it did not work.  "No bootable device found".  So I need to repull with the new Dell IA tools it seems.

Okay, so let's re-push and repull the image with new tools.  Needs Gen2 VHDx...problem, I use PXE booting that only work in Legacy.  So I need to mount a thumb drive now using https://community.spiceworks.com/how_to/3009-how-to-mount-an-usb-drive-in-hyper-v-vm-s .. Well I need to mount 2x thumb drives now since my image wont' fit on the Fat32 drive.

Before I continue, is this the best way to proceed or is there a better suited process for this?  As of now it looks like...

I need to

1. recreate the VM with VHDx Gen2
2. mount 2x thumb drives
3. restore the old captured image
4. Re-capture the image with the new tools

Correct?  Do you have a more in-depth guide for pushing the old .wim and recapturing on a Hyper-v guest using only UEFI?

Edit:  I have enable UEFU PXE booting via CloneDeploy.  It works properly for the 7040's but NOT for the 7060's, checked over bios settings.  Not seeing anything sticking out..