I'm similar to you except that I'm finding that a faster Mac is needed for me, for the stuff I'm doing at the moment. So we've ordered a 27″ iMac with the Quad Core i7. Am tempted to also get a Mini for under the telly as the PS3 and 360 just don't quite cut the mustard as streaming devices.