I would call Mastro as see if they have a '04-05 OEM STi uppipe in stock. IMO that's going to be your best bet when it comes to fit and installation leaks. Don't forget to pickup new gaskets.