Yes, it's an upgrade.
Yes, it's an upgrade.
Sure, an upgrade would be great. If you're fine with it now, perhaps you could wait another couple of months to check out the new AMD CPUs? If they come out soon after, prices might drop a bit. Alternatively, you could consider adding a few more 3000 units. Good luck!