I personally feel that neither one of these versions yours or the other will reach the market anytime soon. You have continually promised your customers timelines that are never met.
You said you were picking them up at SEMA. SEMA passed and still nothing. Then you promised another deadline. I say do not introduce them into the market until they are ready to ship. If they are prototype, then do not take any pre-orders because you just end up getting angry customers, who wait ridiculous amounts of time. I think it's been almost a year. I wonder how many cancelled orders you have. I doubt you will tell us, but I am sure they are high.
GOOD LUCK to the rest of you. I don't imagine waiting this long is worth it. Just my input.