Ok, I've checked in the latest notes to Github and I'm calling this phase closed. Nearly all the hand inserted code has been converted back to Z80 assembler lines. The source is buildable with a few expected discrepancies to the original binary.

In the next phase I will start with the sources so far in a fresh directory and try to get it to build with asz80.