I have an extension for disambiguation that might be of interest to you. I made it over a decade ago to make the disambiguation bits extremely customisable. I’ve also tested it against this issue plus all the others and it works fine. I’ve also tested it against other issues that could come up in disambiguation as well to the point that it’s very robust and battle hardened now.
(Old buggy version of extension. Now removed. See below for latest version.)
The Inform 10 version requires Parser Replacement. I also have a version for 6M62 as well.
(Old buggy version of extension. Now removed. See below for latest version.)
The documentation is still WIP, so feel free to ask any questions regarding usage, but it should be quite simple to use. Hope this helps!