I would do a bake even if you're using NDO2. You're not going to be able to get nice edges with NDO2. Bake for edges, NDO2 for details - that would be fine.
too much hand painting going on, particularly the edge scrapes. there's no big shapes either, only small edge scrapes and generic cloudy overlay. get some photos in there!
I tried masking the edges but then you get a hard edge at where the mask is =<. I'll try the mid value slider / grey though. Will let you know if this was the solution.
It might work to scale the edges in between instead with "edge constraint" turned on. Otherwise I'd just snap them to their parallel vert in 2 axis's to make it perfectly aligned.