No problem, I imagine you're busy. And yes, I'd be glad to help carry this forward. Have a look at my PRs when you get a chance. If you're happy with the direction, I'm ready to take it from there.
Yeah, sounds like from reading through the PRs that you have a great grip on what needs fixing and how to handle it. Invite sent.