Good call on the low water pickup mod on the stock gearcase.. The guys in the shop will have no problem with you hangin' out, my bet is they will have a new powerhead built by the time you get there and just do the swap then (assuming you are having the portwork done), they may also have the lower unit done too.. That should keep shop time down to a minimum and water time way high as priority... There is a rumor going around that some of the fellas at the shop enjoy a cocktail or two after hours I may or may not be able to confirm this but I guarantee you will have a good time!!