Finding a shock from another bike that will be an improvement is difficult.
A shock needs 3 things in order for it to be better.
It has to fit. Right type of mounts both top and bottom, and the reservoir and/or preload adjuster have to fit in the space available.
The spring rate has to be in the ball park. The Tracer shock spring is very soft (at least on my 2020, and I'm only 165lbs) so I'm thinking about 30% stiffer, at a minumum.
The length has to be right. And "right" doesn't necessarily mean "the same as stock". This is what most people miss, shock length is a crucial parameter in chassis geometry. And because of the linkage ratio magnifying things, even small differences are important. 1mm can be felt on a race bike, 3mm the average street rider will notice, 6-7 is a big change. Most street bikes will handle better with a slighter longer rear shock, but there are exceptions.
Good aftermarket shocks are expensive, but if you want a combination of comfort and handling they're likely your only option.