Just wanted to echo what was said above. Gates or OEM. I've had no issues ever with Gates. Replace your waterpump while you are doing the job.
This is includes the waterpump: https://www.amazon.com/Gates-TCKWP304-Engine-Timing-Water/dp/B0052XMF3A
This does not: https://www.amazon.com/Gates-TCK304-Timing-Belt-Component/dp/B002R8HMAY