There is JOSM plugin for working with OSM-Public Transport Data: JOSM/Plugins/PT Assistant. And it has new tricks to offer