Normally I'd say no, it's fine how it is, especially with tomestone rewards.

But then when you keep losing the upgrades you need to finish the story because an i120+ player needs them for GC turn-ins, you begin to rethink that stance ♥