I do think that we are in the waning days of being able to purchase the surplus military rifles. It's unfortunate, but such is life.
Thankfully, modern military pistols are not that much unlike their early 1900's counterparts, and most of them are available to civilians to purchase outright. I think that we'll be buying up C&R handguns (assuming the gun grabers don't outlaw handguns) for long after the rifles dry up.