To me, that tells me that I don't want to ever support that dealer. Charging new prices for used. Apparently that's a thing now. . . . charging over MSRP. I won't do it.. . . . They have a used 19' with 4500 miles for $16k!! Nope. . . .
Since you "know" the bike, it might just take a fly-n-ride to get you your upgrade.