Isa,
I apologize, I think I left out the main point about our discussions about Santa Clause. By talking about how everyone should be able to enjoy the holidays in their own way, we had several conversations with him about keeping his "knowledge" to himself or at worst saying that something was his belief or opinion instead of a fact.
It sounds like you have a good handle on the possibilities at the school and having a teacher that will work with you is a blessing. It sounds like you are way ahead of my on the perils and are making some positive changes to prevent the stituation from getting out of hand.
