Should i upgrade?

You should wait 2 years to upgrade mate, unless you are rich and you have a lot of money to waste. Just wait 2 years and in 2 years there will be better upgrades for a cheaper price. Until then, your pc is capable enough to run everything you want.