For some reason, I've moved to using OSMand instead of OSMtracker+JOSM for adding POIs. It's just so quick and immediate, and doesn't require me to remember or guess about anything. (well, for most part; I tried Vespucci a few times, but it's not nearly as simple and quick).
I did wish OSMand could put multiple POIs in the same changeset, though. It added each POI into its own changeset. There is this checkbox to close the changeset, and it seems to be there for adding modifications to a POI to its previous changeset.
Once again in my time with OSM, I wish I could modify my changeset comments x-P