I am not sure about the watchtowers...

I think we could restrict it to only weaponry upgrades, but not only to pike or gunpowder units. What is your reasoning behind that? We can definately restrict the upgrades to no armor upgrades and I think it would be good to make temples trade buildings that give realistic bonuses instead of the current unrealistic system. This could change with the expansion of course.