If you want fuel economy and daily driver reliability, I would use OEM parts from now on. I just can't really justify spending money on "upgrades" to save money at the pump. I would just concentrate on basic maintenance to ensure the car is running the best that it can.

Buy an OEM timing belt and water pump when you do the replacement. If you have done your own clutch, a timing belt will be cakewalk.

For the cheap short shifter... you get what you pay for...