For me the price for a new Macbook Pro 15" with 512GB and Radeon 455 is actually less than for the Surface Book with Perf Base with 512GB ($2630 vs $2800) and on top of that the Surface Book is only a dual-core CPU! Picking up my MBP from the store on Dec. 30th - hopefully it won't have any battery issues like yours - checking reddit and other online sources it looks pretty random, some people getting regular 12h vs others getting barely 6-7h of battery life.