My mechanic says i should stay with 1.6 roller rockers and possibly upgrade fuel injectors. I see the pic there you have a water pump upgrade? Is that a good idea with H/C/I?Items pictured came to just over 4,000 bucks, now you may be substituting certain parts with others that may be less money or reusing parts, I decided that if I had to take it off I was replacing it, this way everything went together like it should and I wouldn't be pulling it all back apart due to a failure.