Get a new computer, use your current one as a backup and casual rig.
LAPTOPS
If portability is important, the 15" Retina MacBook Pro would be my recommendation. The standard 8GB of RAM is more than enough for music production but if you want to future proof yourself, upgrade to 16GB. The only downside to this computer is upgradability. Everything is soldered onto the motherboard and nothing can be upgraded (except for the SSD, but that's expensive).
If you don't care for portability, the standard 15" MacBook Pro would be great. You get more bang for your buck and allows you to upgrade to an SSD and/or upgrade your RAM after the initial purchase. Downside to this is that the standard configurations do not include an SSD.
DESKTOPS
The 27" iMac is the best deal, hands down. If you have the cash, spring for a Fusion Drive for added speed.
However, wait until after WWDC so you make the best purchase possible. There might be new products coming soon so don't buy now.