SR15 16in - Buffer

I recently purchased a SR15 16in Upper and also an SR30 lower. CA guy here.

Would the HH buffer that comes with the sr30 run well with my 16inch Upper if I am not running suppressed or should I source a carbine buffer that comes with SR15 16in complete guns / SR15 lowers?

If the answer is use the standard carbine buffer..anyone know of an equivalent option to purchase instead of the KAC standard buffer?

Thanks