Simon,
Ring Yamaha Motor Uk on 01932 358000 and ask for technical support. Explain your situation to them and im sure they will help.
I speak to them rather that any dealer as i get a quick concise answer.
Hope this helps.
PS, it does sound like a TPS problem to me.
Dan