My bad, didn't make myself clear enough. My opinion is exactly like yours. I wish we can save Caleb/improve buildings for bareshade without have to progress deep into Bernard's romantic storyline.
If improving bareshade is tied to Bernard's story then at least let us save Caleb without romancing Bernard. Otherwise it's impossible to have a relationship with Caleb without breaking Bernard's heart. That's kind of sad.