I really like the improvement, but I might make one of those outbuildings reflect the earlier style a bit more; just the walls and some debris laying about. The new castle could easily be lived in in its current state.
I'd really like to get rid of LockeZ. His play style is way too unpredictable. He's always like this too. If he ran a country, he'd just kill and imprison people at random until crime stopped.