The SB is a fabulous product - when everything works. If you are okay with an i5 SB without the dGPU, you will probably fall into the group with fewer problems, and that could be a consideration.
If, however, you are considering a more powerful model with dedicated graphics, wait for the SB2. My personal feeling, after owning an i7/8/256 SB for the past three months, is that Microsoft might still be able to deliver a few more software fixes, but the issues that the dGPU-equipped first-gen Surface Books are experiencing are not going to go away entirely.
My guess is that a lot of these issues are related to how the SB switches between GPUs, which happens on the fly, rather than with a reboot.
If your use case can accommodate a system without the dGPU, you will doubtless get better battery life and fewer issues. Still, based on your comment that you want something that will last you for a long time, you will be better off waiting for the SB2 and get something with the bugs worked out of it.
Finally, I wouldn't recommend making a $2000+ purchase just to save the cost of a laptop battery. You should probably just order that now, no matter what you end up doing.