Solved it. Took me ~6 human hours, over a total of 24 hours. But it was NOT easy!
I've been making chips for amost 30 years, and I run the https://github.com/smprather/engineering-loadout project, so I had all the tools sitting at my fingertips (KLayout, Surfer, Icarus Verilog, etc).