Well, I got the tensioner out tonight and discovered that it isn't OEM so I'm going to replace it anyway although it does appear to still be fine (it's very difficult to compress).

I'm going to order the tensioner pulley tool so that I can do the tensioner procedure by the book, hopefully that combined with the new tensioner will solve my issues.