karr,
using 3 pin or 4 pin regulator?
With a 3 pin, master switch could turn on regulator, momentary controls power to atty (after regulator, and after usb power). The usb connection after atty would work if switch was after regulator and USB power but before atty.
With 4 pin regulator the momentary is not in atty current path. USB to input of regulator would give a little less than 5 volts out of regulator but control pin would control atty current.
The original question about diodes: One diode is all that would be needed if a good point can be found to insert it.
If 3 pin regulator and usb power is applied after regulator then followed by switch no diode needed.
If 4 pin regulator and usb power applied to input of regulator you end up with a tie point for battery +, usb +, and regulator input.
The 5 volts from the usb won't flow into higher voltage of the stacked 14500 batteries but the battery voltage can flow into the usb source. USB probably wouldn't like that. If you put a diode to block this current then you lose 0.6 volts from the USB.
If you are using the 4 pin regulator, then another switch is probably best. If could even be a SPDT slide switch with 3 positions, USB-OFF-Battery.
Hard to get these things to do everything. I'm still waiting for one with an MP3 player built-in.
Hope I didn't cause you to fry an atty.
Rocket