I found the upgrade system rewarding, especially since the optimal way to upgrade weapons was to explore the map, thus giving incentive to find every nook and cranny to get the last upgrade points or a new weapon you'd normally get only on the next level. Also, they do have different swapping...