Is Merkaartor still viable? In my experience Java-based JOSM is the only stand-alone editor that can deal with all the complexities of OpenStreetMap if you go beyond basic editing in the web-based ID or various feedback mechanisms of apps like StreetComplete.