Mod Kit Progress

I'm currently working on a mod kit for a French Gothic style Abbey. I've already set up a level that has been play tested and is working well, so now it's time for some refined art. Currently the kit contains:
Light Fixture
Basic wall
Arch wall
Roof wall
Column (with end caps for finishing off roof segments against walls)
Windowed wall
Door wall

These pieces are almost ready to go in for baking and potentially a zbrush pass, though nothing significant. The main portion of my details in texturing will come through a set of a trim normals I'll sculpt in zbrush. I would prefer a majority of my general texturing (base color, metallic, etc) to be defined by tiling textures, and use normals, vertex painting, and deferred decals to do the dirty lifting and create variation.