New bike - 2 days - 200 miles - then broken in the shop for more than a month.
I'd tell them I want a different bike - they can use this one as a demo when they fix it. They won't agree of course since it technically would be a used (already registered to you) bike, so then ask for a loaner something till they fix yours.
I spoke with corporate care <--not they documented my concerns and will not interfere until I have the bike back in my possession to even consider some sort of compensation. BBB pointed me to AG office which I filed with. The Lemon law route seems a bit tedious I would prefer mediation and an outcome like you suggested or maybe something similar to what they offered the 2014 rt owners would even suffice. I love the bike its amazing but this nightmare has spooked the hell out of me. I am not a good angry consumer