One thing I never liked about my Macbook is that there is no option for a matte screen. So I consider switching and finally getting a matte one now:
http://www.productchart.com/laptops/sets/1
I will replace Windows with Linux. I heard Thinkpads are good for this. But the Dell XPS series looks very compelling too.