I would definitely recommend buying from the local dealer where you can get service. As someone else said, since you're already set up for a Merc, I'd stay with Merc. I was faced with this same dilemma 7-8 years ago. The dealer advised me to stay with Merc for that reason. I went from a 40HP 2 stroke to a 60 hp 4 stroke, the shifter/throttle control was the same and it only required a pigtail to hook up the all the electrical. If I went with a Yamaha, everything would need to be replaced and (per the dealer) would probably cost about a thousand dollars more.
I've had Merc's forever, I can't say enough good things about them.
Good luck with you decision.