Somehow one of your segments still triggers the API node limit on upload.

Did you draw that 4000 node segment fresh? If you save your work in josm, as a .osm file, you could then check with an editor if the saved data looks okay, and whether the s in there are shorter than 2000 nodes.