RE: One Battery or Two??
Use 2 batteries and 2 switches. The extra switch doesn't weigh that much and gives you redundancy on the part of the system most likely to fail.
Instead of using one 4000+, use 2 2000+ batteries (you get the same flight time and weight, with added switch redundancy)