defintly need the bump in memory. as for disk thats tough because the higher you go the more expensive it is. i think keeping the standard cpu is fine.