Probably my choice in fact!Honestly, go for the Mac mini--it's the most customizable. Not to mention the included port selection is much better than the iMac.
And we also have no proof or confirmation of a larger, more powerful iMac. Personally, I'd just go for what you know is available--preferably the Mac mini.