Draw calls is not the only source of slowdowns. Fillrate is just as bad, and more objects means more unnecessary fill rate.
I actually like option B in your original question.
If you don’t do option B, then build each wall separately, and cut at the corners – so, like an option B where each yellow area is in turn split.