Yogi - have you had either one in your hands?
Based on your original description of pros/cons, I got the impression that you liked more about the Martin and that the Gibson "would do".
Ultimately, it comes down to your style of playing, feel, and tone that pleases your ear. For a mid/high end acoustic, I would worry less about built in electronics and more about tone and feel. Not saying it's not a consideration, but depends on what your plans for it are.
I have a Carvin C780. When I bought it, I absolutely needed onboard pickup, but most importantly, playability for my style. Carvin acoustics set up like electrics (very low string heights). It's a jumbo, so it's designed to boom and project unplugged. It's not the most beautiful acoustic tone ever, but, live and plugged in, it's punchy and crystal clear (The magic of EQ). It's a different beast altogether plugged vs unplugged.
My point is, that I got it for it's versatility and playability (ie. a functional purchase) because that's what I needed at the time.
Sounded from your own words like the Martin fit your needs the best. They play and sound great.
Seagulls are Godins. (Canadian)