Oh no worries. The upgrades stack. On my 28th day I was so fast that I had a problem not missing my farms XD.
And if you survive around 4nights grinding ore your gun eventually improves to a laser cannon and THAT is some serious damage.
