I wish you luck.
Years ago I had an SW5 and in the process of trying to make the gun work and asking a lot of questions Adam (yeah, that one) told me about the MP5 ejector. Turns out my gun had the incorrect ejector installed from new. Indeed, the correct ejector (after many other parts) helped make the gun go from multiple jams per mag to a single jam out of seven full mags.
Back then I was relatively new to the type and didn't recognize the incorrect part looking me in the face. I cannot say yours was incorrect as I haven't seen it but it will be interesting to hear your feedback when you get the new one and compare them.
Again, good luck. Feels great when problem gun runs well.