when you replaced the cambelt you didn't tension it too tight did you?... cos that can cause the whirring noise, i know i've done it myself!!! As for replacing the tensioner, it would probably be worth it if you don't know whether its been done before or if it looks a bit tired.