least-worst option seems to just kick it back to be broken up into discrete commits?
The least-worst thing for the company is for the senior engineer to work for free. :p
I like it. The narrative is appealing and accurate seeming. Kudos.