Are the bolt groups the same between the GSG-5 and the GSG-522?

I have an early GSG-5, and I'm starting to see FTE's.  I want to send it back to ATI to get the "riveted ejector mod," but they're quoting me 4-6 weeks. I've seen a number of GSG-522 "parts kits" for sale (basically stripped guns minus the right receiver half), many including clearly riveted ejectors.  I'm tempted to just buy one of those, slam the bolt group in and call it a day (3 days vice 4-6 weeks +).

Question: are the bolts the same between the two guns?  I recall reading the "engine" was the same; the only changes were cosmetic driven by the H&K lawsuit.

Anyone have the definitive word?

@ATICSR_Christopher ?

Thanks.

Where are you seeing GSG 522 parts kits?

I would pick up  a few spares to keep an SBR going.  Fun guns but hate to have parts dry up.  I have probably one spare kit would feel better with more!

Check GunBroker, for starters.  There's usually one or two that pop up each week or so.

Thanks for the advice, Chris.  They're good thoughts.  I just want my ejector riveted, and the CS guy seemed to think it wouldn't be a problem.  He wanted the whole gun, so they could do a "complete check," rather than having me just send in the bolt group, hence my question (and temptation) about simply buying a later GSG-5/522 and grabbing the bolt group.  Sending the entire gun turned out to be a bigger hassle than I want to describe here.

Can you confirm that the GSG-522 bolt group is the same as the GSG-5?  I seem to recall you stating some time ago that "the engine was the same" and only the external cosmetics changed.

Thanks.

Scott

Thank you, sir.  Hope you're at SHOT and having a good time.