I guess you've still found no fix for the issue about people seeing they have a Standard Edition even though they bought the Deluxe. I bought mine (Deluxe as well) the day after the Earlybird Promotion started (I can't believe it's almost two years ago!) so seeing "Standard edition" does make me feel a little uneasy.
I hope everything goes well despite the issues you've had over this entire process.