Well i think i should wait for 3000 series then and go with the 1st option [upgrading every thing except GPU and PSU (i got you point Aeacus and i'll definitely upgrade it at the time of GPU upgrade most probably next year)].
Now should i create another thread for New Gen INTEL / AMD or shall i...