My Mac future in limbo

After two years of owning my Mac Mini I'm ready for my next Apple device. I'm anxious to get my hands on a new Intel Mac for the speed improvements as well as the ability to run Windows natively. I would consider purchasing a mac mini or imac today, but with Leopard coming out and a new ilife suite on the horizon that would be foolish. The decision will be between the mac mini and the imac. I currently share a PC and Mac on the same monitor, but going forward I won't be. So part of my decision will be what type of monitor do I want. I'm a bit frustrated with the mac mini's small internal drive (it is what it is), but the price point is great. I hope to hear of talk at the next Mac conference in June of a new, rumored imac.