Im literally in the same boat.
Dasa 846SS
Riva 48's
B Pipe W Mod
Stock pump with tbm/12-17
I don't know what to do first and it's driving me nuts.
Total loss seems like a head ache that I don't need.
I absolutely love my 5 gal tank when I think about the PF.
Mag pump does not seem like it would help, my ski hooks up great.
Im loosing sleep over this!
forsure get a mag because it will make all your other upgrades wake up even more.