Another vote for the BRT linear comp. An added bonus is it doesn’t have to be timed - no messing with shims.
I recently got a Noveske KX3 for a 12.5” barreled upper and I like it as well. It seems to do s good job directing the muzzle blast downrange. Pricey but it might warrant consideration as well.