Add more disks and upgrade to 6.0 - which first?