Maybe next time you could try some 3D rivet decals? Like this.
http://www.micromark.com/O-scale-dec...ails,9967.html
Here's a vid from youtube about them.
https://www.youtube.com/watch?v=VlyUbS1Q4_Y
I've never used them, but they might be the right size for your future builds.