Instead of completely deleting valid existing features that have been there for years and redrawing anew, use the Replace Geometry function from utils2plugin in JOSM to keep history or use them as part of new features. Read https://wiki.openstreetmap.org/wiki/Keep_the_history