I tried a non-inflatable Thermarest for a while, but found myself waking up in a lot pain and just getting horrible sleep. I'm sure there are better better ones out there. Whether you go inflatable or non-inflatable, they're not all created equal and will probably come down to personal preference.
As for repairs in the field, I've never actually had to use it, but I do carry a small repair kit. My Sea to Summit pad came with one. I too have slept on leaky air mattresses; those aren't designed for back country use though, and are usually much cheaper than a good backcountry pad. If you do have an issue in then field, the repair kit should get you through the trip, and I think a good company will take care of you after.