Most of what I'm reading so far I agree with. The 6D will do you fine. I have both the 6D and the 5D3. I honestly gravitate toward the 6D more often. It's lighter, focuses better in indoor/low ambient light and is less complicated. I do enjoy using the 5D3 but if the next firmware update doesn't improve the low light AF, I'll probably sell it. The 5D3 dominates the 6D in fps speed in good light so if you are planning any sports shooting, it's the one to go with. I don't shoot birds, etc but if that is part of your shooting, the 5D3 is the better choice. IQ is about the same so don't worry about that. At the moment it's pretty nice having both but since most of my shooting is ambient light journalistic style shooting, the 6D works better for me.
Either wait to see if the price drops more due to the Yen or go for it now and start getting satisfaction from your purchase.
I also strongly agree that you should get the 24-105 + 6D Kit. It's a great deal. You won't regret it, but you might regret later when you want the 24-105 for $200+ more price. And you will, trust me.