Firm to deliver Bristol's biggest office revamp alongside Bath HQ project