Consider the excellent Bell & Carlson Medalist stocks. I'm particularly fond of the M40 version.
Wyatt Outdoors makes a detachable mag system using their proprietary single stack magazines, 5 round & 10 round. It requires no additional in-letting for a BDL stock. You would need to order new bottom metal screws for a BDL configuration. The Wyatt system is a budget version of the noticeably more expensive offerings by Badger, HSP, Surgeon, etc. The latter systems all require additional stock in-letting & fitting.
I'm using the Wyatt system and quite like it. The single stack mags are longer than the AI staggered magazines and the system is not as robust as the higher cost versions but its a nice alternative for the average shooter.
You'd need a BDL stock, BDL receiver screws and the Wyatt DBM system.
A supplier I can highly recommend is Red Hawk Rifles in Colorado. No affiliation, just a happy customer whom appreciates their excellent prices and service.
MidwayUSA also carries the stocks and detachable mag systems and is another excellent supplier of all things forearms.
I find the B&C Medalist stocks every bit as good as the HSP counterparts and I think their finish is better than HSP.
I own McMillan stocks and have had HSP in the past. They lost me when they affiliated with the assassin Horiuchi.