If you're having to scrap an entire bombsite at this point I would think you might want to give up on detailing and just greybox it until you get a good layout
It looks really nice but you're just gonna end up doing much more work than you need to if you make something pretty then throw it out