For what it's worth I'd say change schools.
Like you I felt my instructor was fine but the company he worked for wasn't.
I swapped just before my GST and all was well.
A new school and instructor may even be beneficial - a new pair of eyes, new ideas, can't really hurt.