re. second and third comments: "weren't worth realigning" is a tricky topic, I also find the validator warnings annoying, but deleting them causes further issues, for example disconnected segments of waterways.  https://waterwaymap.org is normally a nice way to visualize this. 

I quite like the approach you've done in subsequent changesets, I would suggest that method going forward