2006 F90TLR lower unit

[Kinoruqmii]

I need to replace the lower unit (20" shaft) on a 06 F90TLR, and have access to a lower unit (including 5" extension kit) with a 25" shaft off a 04 F100TXR. Everything appears to be able to bolt on, except the shafts for the shifter and water pump are too short. Is there a extension kit for these two shafts, or does anyone have any recommendations to be able to use this long shaft lower unit?

[boats.net]

Yamaha doesn't offer extensions, might check with Bay Manufacturing to see if they offer it.