At this point I'd take a MacBook with a lightning jack, because now I have to carry a separate pair of headphones for my iPhone and my Macbook. I'd prefer 3.5mm everywhere, but if you are going to drop it, make it consistent across product lines.
I'm stuck in the two pair camp as well and I cannot for the life of me understand why Apple makes a 3.5mm to lightning adapter but won't make a lightning to 3.5mm adapter. I have a great pair of headphones that use the lightning cable but I travel a lot and my MacBook along with every airplane uses 3.5mm so I can only use them with my phone. It's maddening.