As i saw the prop list pilling up i thought it would be a better idea to streamline the process otherwise it would start to complicate when managing the various textures and material IDs. 

The solution i ended up going with was to create a set of two trim sheets which would be used to texture most walls and even some props.

These trim sheets were created on Zbrush, through the use of Live Booleans and Orb/Chisel Brushes. Then i applied the "NormalRGBMat" material and resized the document to 2048 by 2048, and snapshoted the document in order to create image files like the one seen below.

 

These images were then used in Substance Painter, as a file for the Normals in the baking process making the resulting product like this: