Need a new laptop - suggestions?

I currently have an IBM Thinkpad R51e. It's been a good laptop for me, running MEPIS with no real hassles, the wireless working okay, and so forth. it does have a couple of minor problems. One, the wireless cuts out after a few minutes if I try to run on battery. It disables, and won't re-enable until I plug the laptop in and reboot. Two, the power connector is mounted directly on the motherboard, as it is with many brands and models. This has worked itself loose. I could resolder it, but that would just put off the inevitable. Considering also that it only has a 40 Gb hard drive, and it's getting some age on it, I need to think about either repair or revision or replacement.

So here's the situation. I want to buy a new laptop. I've thought about buying a Macbook, but I want to continue running MEPIS, as I need the personal Linux experience to further develop my skills with the OS, and I've gotten used to MEPIS and want to stick with it. I need the new machine to meet the following conditions:

* MEPIS friendly
* Wireless not using Broadcom or other Linux-hostile chipset
* Wireless not disabling when running on battery
* Power connector on a separate daughterboard, like in an iBook.
* Not a Dell or a Gateway. Bad history there.

Suggestions?