If you still have sleep/wake issue, take a look at this thread...
https://www.tonymacx86.com/threads/solved-sleep-shutdown.260947/
The solution from post #6 by itwas of deleting all the com.apple.PowerManagement.* files from Library/Preferences and then rebooting fixed my "reboot on wake" issue.
Hmm, interesting, I definitely have more than one of those com.apple.PowerManagement.(UUID).plist files as well. I'll have to give that a shot when I have a moment, thanks!
Update: Sadly, no change. Before and after, waking from sleep results in (50/50 chance of either) a reboot after partial wake (USB devices init, but don't see any disk activity) or just a partial wake and freeze to the point that even my case reset button will not work and I have to hold the power button to shut down. Only entry in pmset -g log regarding a wake failure is the same each time:
"Darkwake Exit Failure during wake due to 0xCD49FC3000000032:"
And that hex address doesn't seem to come up with anything on Google when I try to figure out what the heck that means. I'm thinking of picking up an RX560 just to have a native discrete GPU to test against, to make sure it's not something else I haven't configured correctly. "Normal" CPU/iGPU power management (throttling down clock, etc.) work fine, my USB ports are all specified via an SSDT (and under the 15 port limit), iGPU framebuffer is properly edited via WhateverGreen to match my actual port configuration...I'm probably just missing something silly, I'm sure, heh.
I've attached the usual debug files in the event anyone wants to take a whack at it (assuming it's not just that the 630 iGPU still isn't actually capable of wake, heh.)