After speaking with Support, it looks like the double charging has been resolved, so everyone can feel free to continue filling them out! 

I'll also be tweaking the shipping rates in order to reduce charges for those who've added additional items from the pre-order shop. I'll either be reducing the rates, or giving complimentary credit to those who qualify. Let me know what your preferences are!