azure
Final Approach
This.To the OP, FWIW I had to change my CFI on the eve of the checkride, because he had to take personal time off to deal with a family emergency. He recommended another experienced instructor to guide me through checkride prep, and I nary lost a step in the process. I may even argue that it was beneficial, because I got a different perspective on everything from preflighting the plane to how to do a diversion.
If you feel you have to make a change, then do it. Don't gut it out for the wrong reason.
I also ditched my first CFII when I was ready for the checkride, but did not yet have a sign-off nor an appointment with a DPE. The reason was that he promised to find a DPE for me (the one he sent all of his students to had had his designation recently yanked for paperwork "irregularities"), and then fell short as my written expired, and had a very unapologetic "that's the way the cookie crumbles" attitude about it. I don't know what area you're in, but my your description of your CFI's surly demeanor matches mine as well, though my guy never did anything as inappropriate as hitting my hand and causing me to momentarily lose control while taxiing onto a runway. But his chewing out other pilots on the CTAF and poor people skills in general, and especially with students, are well known around the airport.
It probably cost me a few weeks, since my first choice for new instructor had to bow out of my finish-up training for personal reasons, and winter was coming on fast. And I have no issue with his skills as an instructor, only with his personality and willingness to treat me with respect for my time and resources. But I still think it was worth it and I have no regrets about firing his butt.