In addition to your suggestions, I would do the oil trap and hoses, and replace both vvt hubs along with the tbelt, water pump, rollers and all cam/crank seals. It might seem like overkill, but I've seen too many vvt hubs leak oil. Login to read more.