Please remember that any mention of competitors, hinting at competitors or offering to provide details of competitors will result in an account suspension. The full rules can be found under the 'Terms and Rules' link in the bottom right corner of your screen. Just don't mention competitors in any way, shape or form and you'll be OK.
Likely a minimal upgrade, early next year the next version of Ryzen is out which hopefully should give you a better performance boost.
this made me chuckle...Give the money to me and write 1800x on the processor in crayon and overclock it a bit.