So I'm getting funds together to buy a Mac. I had been debating either a 13" mbp or iMac. Lately I've been leaning on going iMac as I gave an iPhone 4 so I won't really need the portability. But after reading about the quality issues with the iMac I'm rethinking. Maybe a mini with cinema display...or 13" MBP with a larger monitor down the road. It likely won't happen til after the holidays so I wonder if the next iMac refresh might fix these issues.. Thoughts? Suggestions?