200k miles 2005 RC 2.7 2tr-fe VVT gear/timing chain/balancer delete

I am preparing to pull off my timing cover and do a bunch of work at once. I have had the rattling at startup for years and would like to refresh everything while I have it apart and am planning on using OEM parts and replacing gaskets and seals. So like the title says I was thinking

Timing chain/guides/tensioner
Water pump
Flush coolant
thermostat
All gaskets and seals form parts I am removing
LCE balance shaft removal kit

I had a couple questions and I welcome any comments or feedback since there is so much experience here.

Is part #13050-75010 the updated VVT sprocket with the fixed spring and sizing for the locking pin?

I don't think I ever replaced my water pump so I figured it would be a good time to. I already replaced the plastic coolant elbow with the updated metal one when it broke years ago.

I had the frame replaced about 5 years ago and rebuilt the front end and upgraded the suspension and replaced my cat back exhaust with a lightly used 3rd gen TRD in April. I am planning on keeping this as long as I can a rebuilding/replacing the engine if something happens in the next decade and it makes sense.

Any input is welcome. Here is the link to my leveling kit and wheel swap. Thanks.
https://www.tacomaworld.com/threads/lifted-regular-cab-picture-thread.69118/page-55#post-27261553