Finally pulled the trigger on a new rig, went for a Ryzen 5 3400G :)