Bretts, as far as motorbike sourced speedos are concerned, you'll have to stick with a Yamaha one as these 11's have an odd speedo drive ratio.
Here's a couple of options from the round XS brigade -
^ This is an RH dash panel with blinkers, oil light and neutral light in the centre
and fuel and high beam in the tacho. Sorry, that's the best pic I have of them.
Here's some from my original Special Gauges -
^ These differ from the RH in the idiot light locations.
^ Speedo dial is plain faced. These can be had cheap from the states, though finding one that's not maxed at 80 mph is the challenge
^ note the single warning light for the indicators in the centre unit.
^ Tacho on these contains Neutral, high beam and LOW FUEL warning lights. (It'll work with your tank sender)
maybe one of these and a digital speedo??
Only hitch with these is that the wiring connectors are different, though the wiring itself is mainly the same. I'm currently looking at making a set of mini looms up to refit these to my bike which has a standards harness in it.
You ARE going to get the bike registered and running reliably before making mods like this, aren't you??