I'm looking to upgrade my mid-2011 Mac Mini and wanted to go with an iMac, given that I can use an adapter to connect my existing 27" display. I've looked around at my retailer of choice and can get a Retina 4K 21.5" model (https://www.nfm.com/DetailsPage.aspx?productid=44484517) or a Retina 5K 27" model (https://www.nfm.com/DetailsPage.aspx?productid=44484541) for a comparative steal. This would basically be my all-around workhorse. Web browsing, word processing, music/movies and moderate work in Photoshop & Lightroom (which is do-able on my mini right now, albeit with a few hiccups). With that said, I'm wondering if there would be any real benefit to waiting for new Kaby Lake-equipped machines?