I think I've decided to go with a 6D. I mainly used centerpoint AF anyways, so my understanding is that if that's the case, I'm not losing out on any AF performance. Please correct me if I'm mistaken. Also the youtube video of Chuck Westfall showing off the wi-fi app sealed the deal for me.
Given the lower price, I might just go with BigValue and not worry about the warranty as much. If it was the 5DIII, I'd probably care more since the ratio of repair cost to replacement value would be higher. Not sure if that logic makes sense, but it saves another $250 over Amazon, which seems like at least one paid warranty repair.