I recommend you should use script triggers to update the normal fields instead of using those unstored calculation fields.
I am recreating one old solution which is using hundreds of unstored calculation fields in a table which nearly has 2000 fields.
The system is really slow.
Yes, upgrading hardware is a good way, but for a long run, you have to reduce using unstored fields.
Regards,
Nhan