Have you tried Pushpin? I've tried Go Map but I found it powerful but a bit slow. Pushpin is intended for editing details of POIs like shops and businesses while Go Map lets you do more comprehensive mapping.
Since installing Pushpin, the amount of stuff I've been adding has gone through the roof. http://pushpinosm.org/