I think you should upgrade the ram to at least 32gb before considering upgrading the CPU. Ryzen 5 2600x is still quite good for Home Studio, but...
Separate names with a comma.