Thanks @AbbyE_Esri. It's a good suggestion but the roadmap for webappbuilder is not good news for me (and many others I suspect). I need the tools that I'm building to have greater longevity than that!
Slightly frustrating, as web appbuilder is a great tool, and Experience Builder just doesn't match its capabilities yet.