JimmyC: I'd go the external drive route too.
Going back to the iOS8 upgrade, depending on your requirements for syncing to\from your iDevices and your Mac, wait until Yosemite is out until you turn on iCloud Drive on your iDevice, otherwise your Mac will not be able to access stuff from your iDevices.
Will do, cheers