Seems like your on the rite track, I spent a few months trying to sort my issues....in the end I gave in and got it booked into NMS as there 5mins away.
Depending where you are I guess a tune and check over would have it purring again.
Chances are its probably not been looked at for a fair while?
There are some o/e looking fpr out there now....I must call into Ggr and get one.