Almost exactly (hehe, see that?) what I settled on.
I like OSX. It is arguably the most polished, coherent desktop OS out there. Sure, Linux understands multitouch... but it doesn't use it most places, programs don't know what to do with it.
However, I work with HPC. I much much prefer to dev in Linux for that. An all-inclusive package manager is invaluable here.
Yosemite has this thing where a maximized window is treated like a separate desktop. So I full screen a VM of Linux (and I have several) and it's presented as just another desktop. One little swipe of the touchpad and I can go in between them. I get the perks of OSX (battery life, compatibility with some apps I need for the workplace, etc.) and the benefits of Linux (dev ease, stronger control of the system) AND the benefit of my work being in a snapshottable VM.
Truth be told, I'm actually sitting in the VM most of the time.