I am thinking about buying a cmbp 13 the base line and upgrading it myself cause I need a terabyte internal storage. Should I wait for haswell refresh? Provided that it will take long time to be available in my country. That's if the classic line got updated of course. So what you think guys?