Best buffer/tube/spring for 16” aero m5

I already have a standard length aero .308 carbine buffer kit and ran into a few issues with the bolt bouncing off the rear of the receiver. I don’t even want to try to deal with this aero .308 carbine buffer from what I’ve seen online. Does anyone have any recommendations for a good buffer/ spring / tune combo?