Open Core Won't boot from NVME without USB Drive in and KB not working after wake from sleep

TDLR : Open Core 0.6.1 now booting but 2 issues that are a pain

1) will only boot of the original USB Open Core install disk, not off the SSD its installed onto
2) when waking from sleep using power button the usb keyboard and mouse have no lights and don't control the PC so have to reboot with long press of power button

Details

1) Booting. I have reviewed the post install notes and copied the contents of the USB EFI folder to the EFI partition on my SSD. I've followed these instructions https://dortania.github.io/OpenCore-Post-Install/universal/oc2hdd.html#grabbing-opencore-off-the-usb but it seems too simple just to copy the files, and in my case it doesn't work. Rebooting the PC without the USB drive results in the computer entering into the BIOS as there are no bootable drives.

2). When booted from USB, and choosing the OpenCore installation from my SSD drive from the boot menu all seems to be working well until I leave my computer and return to find its in sleep. Wake from keyboard (as my mac mini does) doesn't work but pressing the power button does. However neither keyboard nor mouse (USB Wired Mac Keyboards left over from a long time ago) have lights on them and I can't enter my password to unlock the computer. Only thing to do is hold down the power button and reboot. Sometimes disconnecting the USB and reconnecting or reconnecting to a different socket gives me lights but not always a response from they keys and not always a response from all they keys (eg I'm unable to delete)

Google has thrown lots of pages back at me but they are all subtly different to my situation or just refer me back to the pages in the install guide which I've already worked through

This is my first Hackintosh self build having used Macs for the last 10 years
This is my first UEFI PC build

Any help or pointers appreciated.

CJ

Opencore 0.6.1 Catalina 10.15.7
MB: MSI Gaming Edge Wifi Bios V 13
CPU: AMD Ryzen 5 3600X
Mem: Corsair CMK16GX4M2B3200C16 Vengeance LPX 16 GB (2 x 8 GB) DDR4 3200 MHz C16 XMP 2.0
Storage : Sabrent 1TB Rocket Nvme PCIe 4.0 M.2 2280 Internal SSD
GPU: Sapphire AMD Radeon RX 580 8GB PULSE OC Lite Graphics Card

Kexts :
AppleMCEReporterDisabler.kext
NVMeFix.kext
IntelBluetoothFirmware.kext
VirtualSMC.kext
IntelBluetoothInjector.kext
VoodooHDA.kext
Lilu.kext
WhateverGreen.kext
LucyRTL8125Ethernet.kext