Stirfry, sorry to hear about your problems. My switch is like Dayvape's, it's black and centered. My batteries don't rattle and I use some of the smallest 16340 batteries on the market (AW). Stretching the spring will fix the rattle. I know Mike designed it around Ultafire 16340 batteries. I don't have any problems with adapters. I screw the atty in the adapter first and then onto the Buzz.
Anyway I would let Mike know about your problems and he'll take care of it.