MacBook Air :: Over Heating Eat And Limited Battery Time

I have a rev B MBA, which is gorgeous but I have found myself using it less than any other Laptop I've ever had and it is simply due to two reasons:

- Heat, pretty much anything except simple browsing raise the heat
- Battery time, simply lousy (including charge time)

Have had it for a while, 14 months, but at this point I have started looking at the 13 and 15 inch versions as replacements down the road. I thought it would make a great compliment to the imac but due to the limitations above I use it less and less. If only they had added a fraction of an inch of thickness to allow better heat handling and more battery.