Mike - you have a beautiful bike, why don't you consider getting another in addition to the 350?
I was in the same boat a few years ago. Had the 550F and really liked it but didn't feel real comfortable on the highway, wanted a heavier, more powerful bike. That's when I sold the 550 and bought the K4 836.
Ironically, I then missed the 550, a much lighter and nimble handling bike. Ended up buying another last year and love having the choice of what I want to ride! I tend to stay close to home on the 550.
Would be willing to let you test ride either if you're interested.