How to find Yamaha tach P/N

[leahcim_e]

Both tach and speedometer need to be replaced due to faded screens. I took the tach off today in hopes of discovering the correct P/N to search the web. I see no P/N. I have a 1999 21 ft DC Century with Yamaha 150 salt water series. The tach has the trim indicator on the right side with 4 icons on the bottom. Temp, red rectangle with empty circle, yellow rectangle with oil can and green rectangle with full circle. There are no multifunction buttons on the bottom. I have seen multiple numbers on the web (6Y5-8350T-82-00 and 6YR-W0035-E-00) but have no clue whether these will work without replacing harness. Any suggestions?
I see a pic of my tach at the Hull Truth (images of tach at beginning of search)

[boats.net]

Here is link to parts needed, 6YR-W0035-E1-00 Multfunction Tach rig kit
6Y5-83570-S5-00 Multifunction Speedometer
Set tach setting for 2 stroke engine, 12 pole alternator and 3 wire trim sender.