I'm torn between adding a new building and replacing warehouse. I don't defend any points but I enjoy vanquishing the bunker when under enemy control. Easy pickings for the guys on the AAs and MGs. Warehouse is just in a tough spot and it is extremely difficult to take it from red control with the buttons so close to the spawn.
But I don't think I want warehouse completely removed either and an aircraft carrier sounds phenomenal.