Go Map!! can do everything, as mentioned by kevingrahl in a comment, but https://every-door.app/ is also very cool and very useful for small, quick edits of POIs.
As far as using OSM - I highly recommend Organic Maps, it doesn't offer editing features but It's great to use, the maps are all downloadable for 100% offline use and open source. It was made by the devs behind the original maps dot me (before it changed hands).
BTW: EveryDoors author is https://news.ycombinator.com/user?id=Zverik