Just a quick report back on this - I took the cranks off, cleaned the spindle, regreased the crank bolts and put it all back together. (Didn't do anything with the BB). Couldn't do a long ride, but as far as I could tell the clunking I was experiencing has gone after that.