I agree, I do think though that Main Power Up could work well too.
You may want to have for Blasters, Main Power Up, Swim Speed Up and Ink Saver Main
For Chargers, Maybe Quick Super Jump, Ink Saver Sub, Ink Saver Main, Sub Power Up, Tenacity and Respawn Punisher
Rollers, Ninja Squid, Sub Power...