I reckon you made the right decision,the CFI is incredibly helpful,and certainly never shouts.
He hums and makes little sounds to himself,taps whatever intrument you have just mis read or not read,and never makes you feel stupid.
The other instructor I flew with at Old Buck was exactly the same,I think I had a couple of lessons with other instructors but basically it was Gerry or Andrew,both excellent.
Good luck and happy flying.
Lister