I had a similar setup, and what helped was checking AR15 uppers that already have the right buffer tube threads for the stock I wanted. Some uppers come pre-threaded, making it way easier to match parts without needing adapters or extra mods. Made fitting the AR-stock feel more solid and less...