Thanks a tonne for having a look at this. I’ll experiment with the dirty paint vs clean paint, because I don’t want to decide which one I want until I’ve seen both possibilities plumbed into the material I already had.
Could I also just ask for clarification on what you meant by the roughness map being shot? Did you mean the texture itself, or just how I went about connecting up the nodes in the material?