That would have been my recommendation as well. The stock springs are readily available, so even if you mess it up, you're only out a couple $$.
I'm currently testing the PELT trigger in my X5 with the GG spring. I may try swapping back to the stock spring with the PELT trigger as the return feels a little "squishy" with the PELT and GG spring.