Ah, you beat me to it. Through the magic of visiting grandmothers and a wife home early from work, I have just made a patched version and came in here to upload it. Well, yours is here now for others to download and use as they see fit. I am very happy that I could help you get your phone fixed!
By the way, if it's not too much to ask, could you tell me if the disc code (6th column of the sgdisk --print output) is the same for boot and for system, and if not what is the code for system? I'm asking because in my adventures getting my phone fixed, at one point I ended up entirely without a system partition, and I just wildly guessed at those two having the same code. My phone works and I have not observed any issues, but still, just for peace of mind.