Yes, we experience the same issue. As a work-around, I design
"duplicate" templates. So, in your case, you would need the one
you've already designed, plus the same template with the principal
block removed, another template with the teacher block removed, and
then one more with both the teacher and principal blocks removed..
Then, use each template as appropriate. It's clumsy, but I haven't
found another way around it.