'81 GPz big rectangular dash change to round gages

Hi,

I have an '81 gpz that I'd like to change that big dash out for some round gages. The speedo appears to be electronic. Can anyone tell me what year and model round gages would interchange? Also, the key currently goes in the panel below the dash that has the odometer in it. I don't really need the odometer and it won't go with the round gages. Can I just replace the key switch with a stand alone? Again, what year and model would work?

thanks, Matt