Don't bother waiting. I was in the same position for past 8 months. Originally I was waiting for the mac mini, since it seemed like a refresh would be right around the corner. Then in April I analyzed my options and determined the iMac would actually fit my needs better, so was researching that and thought I would wait until WWDC to see if anything would be announced.. After seeing the low end model released I realized I could not wait any longer. So I sprung for just the base 21" i5 2.7Ghz model with the 256GB SSD upgrade. Do not regret it at all, this machine is fast. Does everything I need it to extremely fast. I was debating going for i7 in the 21" model but was starting to get too expensive. I use the machine for Web Development (PHP with Symfony framework), iOS development, and android development. It has been extremely fast for all of these purposes. I am a long time windows user (25 years since Windows 3.11).. I also still use windows as my main personal machine. This is first time ever really using a mac (outside of running one in VMWare for iOS development).. It is taking getting used to the operating system, and basically getting my memory to realize command = ctrl.. And trying to learn all the new keyboard binds. I also HATE how Apple put the function key where the ctrl key is suppose to be. I cannot get used to that, so I downloaded Karabiner and swapped the fn and ctrl key.. I may end up just going back to my old keyboard or buying a full sized apple keyboard as I cannot stand this small keyboard with no numberpad. Anyways I digress.... Some things I love with osx such as spaces and spotlight that just trump anything on base windows install. However I still much prefer windows taskbar over the dock, and I prefer menu bar to be bound per window not desktop. I often have multiple applications running at once and it is annoying how I have to actually activate the app first before I can use a menu command, whereas in windows I can actually click on the menu without the window being currently activated.. but fairly minor issue. Anyways TLDR: if you are on the fence, just go ahead and buy now you won't regret it.