Honestly the two setups seem quite a bit different. Just do it right and do it once.
Sell the MAF-T and use the money towards DSMLink
I had maf-t on two of my cars, and it is nice, but DSMLink is way nicer.
Evo9 pump is fine unless you're gonna rock E85, then you'll need a walbro255.
Evo560's will be plenty if you stay on pump, otherwise 780's might be a tish small for E85, 880's should be good.
Either way, get it tuned for the best results. Make an appointment with shane, trust me