> Do you think this could be fixed in time for Emacs 30?

Please try out the following patch.  At least it works for your test case.