Yep, oil pressure switched changed about 5k miles ago so I knew it wasn't that and I checked that too as the one I bought from GSF lasted all of about 3 months before weeping again.
I think I'll take the advice of Gazareth and thrash it to within an inch of it's life and then see what the score is !
Thanks for all of your replies.