Absolutely this. Just replaced mine a few weeks ago and problem solved. Mine likewise chirped when I gassed it, but more often when I gassed it and then AC was also on.
I was thinking about turning off the AC, and try it out that way also.
I only have, 44k miles on my car.
Good call on the tensioner. How easy is to replace?