So I read the whole thing twice. I didn't see something that came to mind so I went to test it. With the storage update, it combines weapons of same type and level, but with no identifier of pre- or post-economy change. I had about 4-5 Thunder from PreE but now I have all 10 in one stack with PostE upgrade times. Just to test my theory, I checked my Ballista, one PreE level 5 and PreE level 2, two PostE level 1 I made just last week. I double checked upgrade times just to be sure. I rushed one PostE level 1 to level 2, then unequipped the control PreE level 2. Sure enough, they stacked and now have upgrade with new time. That's pretty dirty, especially on weapons that changed time and cost significantly. I hope this is a bug and they fix it, because I don't think that adheres well to what they told us about being able to keep PreE times and costs on weapons and bots we already had.