I'm not too bothered by speed given the commuting I do, just keep ahead of/between cars

but I'm gonna find myself hitting the bottom of the fuel tank unpredictably without the odometer

I've already sprained an ankle last year pushing the bike when it ran completely dry (note for the skeptics - if you have a nearly-empty tank then a steep hill can introduce a vapor-lock so you can't get started even with enough fuel to cover the bottom of the tank and it's bloody easy to sprain an ankle pushing a bike in the dark when you step into a drain!).
Being more of a carpenter than mechanic, is the speedo worth taking apart and which end should I start at (hub or instrument) or should I just take it to the Yamaha shop who did my last service?
thanks
Andy