KeypadMapper is also good for address mapping. Leaves you with a .osm file, from which you can tweak the position of the nodes in JOSM and then upload.