Reply to Mac Upgrade

Well Im currently selling my macbook pro to a friend and plan on updating to a new one but now I ran into a problem. The new macbook with the Haswell processors should be releasing mid-september/october. But I'm debating on getting a 13" macbook air & mini vs a 15" macbook pro. The mac mini would be used in my studio for more production side and since its small it wouldn't be a hassle if I ever had to bring it somewhere. The air would be for live stuff. Heres the prices with upgrades included what would you do? Also I would be buying the air now and wait for the new mini to come out if I went that route.

Macbook Air 13" = 1250
1.3 i5 to 1.7 i7 = 140
4GB to 8GB RAM = 90
256GB to 512GB = 270
TOTAL_________ = 1750

Mac Mini = 780
2.3 i7 to 2.6 i7 = 90
4GB to 16GB RAM = 120
1TB HD = 0
TOTAL______________ = 1020

TOTAL______________ = 2770

Macbook Pro 15" = 1700
2.3 i7 to 2.6 i7 = 120
4GB to 16GB RAM = 120
1TB + 512/960SSD = 375 / 600
Accessories = 30 [Tools, Extra HD Bay,etc]

TOTAL______________ = 2375 / 2600