Decided 17 loose spokes was probably a few to many. So a quick visit to TTR towers for a new set and the loan of a wheel thingy, out came the grinder and after an hour new shiny ones fitted.
Now has about 3 to 4mm runout, will spend a while trying to get this a bit better. But guessing with a knobbly on a couple of mm is fine??