Im currently working on the 2.0 to 2.5 swap in my 05 wrx. i'm looking for any tips or advice for the swap. i have my eyes set on a 09 ej257 short block from Flatirontuning.com and also getting the master swap kit that includes the replacement parts and ext. Curious if the newer block will work with the 2.0 valves n ext. and advise would greatly appreciated.