I think that all in all, the whole class and job system that is in place right now should just be completely overhauled. Scrap it and put another one in place. The current system just needs a good replacing.