@jeepinoutwest - You might consider buying the extended warranty. It's often <$500 for 4 more years and is unlimited mileage. Both paid for themselves on my '12 and '15 bikes. You appear to ride enough that you have a better than average chance of it being a cost effective investment.
Further update: Did about 250 miles. Cruise control is still broken. Will come on like normal but after some time it starts flashing and can no longer be set. Sometime cycling the ignition fixes the issue. Sometimes not. My Cruise control was out most of the day. This issue was brought to the attention of dealer at the time I brought it in for the throttle, apparently they are two separate issues. Still like the bike but it’s not as anvil reliable as my ‘17 was.
Failed cruise control is a known issue with Gen 2 bikes, usually repaired with a new front brake light switch, get it while you still have warranty because it is expensive. Yamaha Europe, UK and Canada has a recall underway for this switch.
On the cruise control something to try....After the reading the trials and tribulations someone went through in the tech section with their cruise control to find out it was a brake switch....and a couple of others who cruise control was not working and replacing brake light switch worked..
Mine went out on a trip. Knowing it was more than likely the brake switch....I got up to some speed, then one at a time: I locked up the brakes. I did it first with front brake....then again with rear. It fixed it and the problem has not come back in a couple of thousand miles.