Believe me, I'd go all out if I could afford to do both, but I simply can't in one season. The "right" way to do it would be to refresh the bottom end and do an H/C/I, thus removing all doubt. ;)
The H/C/I, supporting mods, and tuning already give me a nice fat bill, I can't imagine adding a...