Just because you have more tools now than before does not mean it's better (-: Acording to my excel sheet, the toolmakers cost you less licences than converting stone and wood to tools.
All other things you said i agree with, btw, those can be more profitable if you enjoy trading.