New 4 stroke need Replacement Gauges

My boat had a 1999 F-100 outboard with analog gauges (tach, trim, fuel) I repowered with a 2006 F115 and understand I need new tach and trim gauges. Does Yamaha offer new analog gauges for the 2006 four stroke that would fit in the same holes? All I can find is the multi function which seems nice, but not sure of the size and since funtionally it would replace two originals it would leave a hole in the dash.

Ideas? PN's for gauges and any wiring harnesses appreciated.

[boats.net]

Yes they do have analog tach and trim gauge.
6Y5-83540-20-00 4 Stroke tach with oil pressure and overheat light.
6Y5-83670-12-00 Trim gauge
6Y5-83653-10-00 trim/oil harness