I would either get a new spring, maybe a Guarder SP-90, get another M4, or a pistol. If you can swap a spring its your cheapest alternative. You also already have the mags for the M4 system. Its a little boring, to have two of the same gun, but hey if you want full auto in cqb that's not a bad idea. I personally don't focus on CQB since most of the fight is getting there. I use my TM Hi-Capa once I'm engaging targets at close range. I have even found it useful in wooded areas but its uncommon.
Your other option.
Pistols in CQB are much more compact and provide a quicker reflex. They allow you to work angles much better than a stocked rifle. You still need to be very accurate since you may only have time to double tap someone in the chest. But, in my experience, I have felt comfortable in CQB with just a pistol when everyone else has an AEG.
Getting a pistol will also fill another part of your loadout allowing you to transition from your field rifle to a CQB. Allowing you to have access to more gameplay and control in what your team is facing.
A new gun may run you the same price as a good GBB. ~$150 shipped. I personally would not consider anything but a TM but others have their opinions. I have had mine for almost 3 years now and besides two loose screws and needing some silicone I have never had a problem. If anything I would say its trigger sear and hopup bucking need to be replaced but these are wear parts in GBBs. Its bone stock and I have been running it on propane since I got it. In the winter it shoots in the 270 and the summer its around 330+. I have engaged targets at 100' on many occasions and have been surprised how easy a shoot it is.
hope this helps,
mateba