Pat OwlOrbs on the head.
Rub the wizard!
Correct. You only count Infantry BP if the city is used in defense. You can opt to fight outside of the city (foregoing its DS) to include your Chariots in the battle.
Corrected my comment. That's what I get for answering questions before coffee time.