Toby, I do not consider you to be anywhere near a "pain in the butt," quite the contrary.:  we have had an educational, reasonable, adult dialog.

You are welcome for my diligence; I have found that it frequently pays to be diligent, here we are.

Keep on mapping and mapping well and I'll do the same.  Meanwhile, the data in OSM get better and better — and that's what it's all about.