Well I bit the bullet and decided to sell my 3 month old PC:
I5-10400
32GB 2666
1660 Super
Decided to go with:
Ryzen 7 3700X
32GB 3200
GeForce 3070
Went from intermittent stutters and med-high graphics, to running all ultra settings but scaled the terrain level and object level back to 100. Running like a top now!