Just had an email from the spares & tech support manager at Fisher- having spoken to my LBS and talked through the damage, it appears that (a) the parts that are damaged can be replaced rather than having an all-new hub fitted and (

they actually have those parts in stock, they were sent out Wednesday. Even if I have to pay for them myself rather than being covered under warranty, good news.
So might be the Jetstream after all. I can say with certainty that I will be on a Dahon, and it will be black (both bikes are...). The understudy is waiting in the wings should an appearance be needed- it's had a bit of a wash this morning, degrease etc (OK, chain and cassette still rather worn, but...), so ready to go.