I would say do that before the FMIC, that might have been one of my issues after the downpipe. I replaced the whole pump, didn't have a good experience with Fez when we did his internals.
That's when c-tree earned the "smoke screen" status all over again. The whole street was smoked the f*ck out. I've never seen that much smoke come out of one car without burning something to the ground.