yes it wil mate 4/5/6 tensioners are the same i had trouble i broke mine the other week i got a 1.8 4g93T and was hoping to pinch one of a braker but mine was slightly different to the part numbers on the 4/5/6s call camskill or mitzi... mine had to come from japan 129 quid!!! that will learn me.
1.8 it seems you got all the gremlins surrounding your car buddy. Still, the trial by error enthusiasts usually do give good advice because they learned the hard way. That sticks in your mind permanently as do all the tricks you learn along the way!