Cleaned the speedo out with carb cleaner, then gave it a lube with WD40. Re-installed, it worked for twenty minutes then stopped again.
Looks like I'm going to have to take it apart and do it properly!
North Hollywood will be the last resort, what with me being in the UK, but thanks for the tip it's good to know such places exist