i actually just did the same tensioner swap it was a bitch
it has nothing to do with the headgasket the h22 will fit just gotta use elbow grease i just got it on today and tensioner was a little to tight i had a small wine but nothing a small tensioner adjustment cant do good luck