I haven't looked at this Calc yet, but i did notice something from your older one.

For indy production, anything over ~33000 buildings would give me invalid troop production per turn. Was this a planned restriction?

Apart from that, the work put into it is remarkable.