Switch. The sooner, the better. I switched once simply because we didn't really get along. He was a different type of person, did his job just fine, but our personalities didn't quite mend in the cockpit/sim/oral room. When he found out I put in a request to switch, he was understanding. Hopefully your current CFI will do the same, and hopefully he'll learn from it.

CFI's are to be professional, carry a positive demeanor and be able to critique their students in a way that enhances learning opportunities.