in the genuine interest of saving you money - you don't need to change either components. To break a GI / milspec charging handle takes a lot of concentrated effort. i.e. someone treating the rifle like a mortar and stomping on the CH to extract a stuck cartridge. You can go down that slippery slope of "What if this fails" - everything will fail eventually - i.e. a car, house, our lives, but the probability of those two components failing soon are likely low.
Just my 1 cent.
Bill Geissele's company is a good one and he started with a really great trigger when the only great trigger comparable was the Milazzo-Krieger at the time, but some of his products are really "G-to-the-ucci"

. He has to increase his market share and make money. $89 for a charging handle?

$65 for a buffer spring?

similar products before Geiselle's were Tubb and his braided wire buffer spring along with carrier weights. It didn't make my rifle any more accurate though felt recoil was much less. David Tubb was a recognized shooter and like any other entrepreneur used that to create a brand and market products. I later went back to plain vanilla GI. But that's my small experience shooting 77s and 80s.
In the end, its your money and who am I but a measly avg Joe sitting on a curb like John Lennon watching the wheels go round and round.