Oh yeah I’m liking version two as well!
Here’s a thought, you have a siding off the “main” which I’d guess to be the inbound line. What if you angled some tracks off that to get away from the straight lines look?
You could cluster the older buildings in a group to suggest a little history, like they were here first.
That water tank being torn down would really set that off!
Arrange the newer buildings to give the appearance of being added later.
Usually the farther you get from the inbound track the more the chassis will have been stripped down until you arrive at the grave yard. You’ll need weeds, lots of weeds!
Heres a little something from my savaging days to keep you inspired, taken from a photo on my wall:
View attachment 113659