Whilst its all off, you might as well do the cambelt kit, water pump, clutch etc.. As you said, saves hassle down the line.