Maybe you've been talking to the wrong people (us), when you should be talking with the dealer.
My suggestion is that you go to whomever it is that you've been talking with, tell him just how you feel about the whole situation (that you really like the bike, but are worried about further problems) and see what they say to you.
Since the dealer is so willing to take the bike back, no costs to you, tells me they are confident they can sell it easily (again). The demand for these models seems fairly high, and, as several have found, the supply is low. Ergo, quick resale for the dealer.
I'd keep the bike, but, you have to do what is comfortable for you, of course. I'll pray for you about it.
