The best bang for the buck upgrade you can do is to save your money and do an H22 swap. I wouldn't do any upgrades to that current motor until you fix all the little problems that you explained above good luck.