Everything went without a hitch for me on Gigabyte ga-z87x-ud4h, Core i7 4790K and NVIDIA gtx 980.
Updated apfs.efi from the link on the 1st post, upgraded Clover to r4522 and installed 10.13.5 from the App Store.
After two reboots, I was back at the desktop. Upgraded NVIDIA web drivers from...