I know devs hate this topic because they fear we'll all finish the game in half an hour and move on to other game. But I disagree. What you need to do is boost the max level on everything!
And please separate upgrading buildings from modifying them already. Two different words, two different processes, and yet we cant modify a weapon if there's a building upgrade going on. This sucks!