Yeah, the clips are helping, but I've reset it, tensioned, and checked several times now and haven't gotten it to line up yet. I've probably been through 5 cycles.
What's worse is I've just realized that my timing belt is rubbing the water pump so it looks like I have the wrong water pump.

Super, there's another week of nagging from the wife while I wait on the RIGHT WP.