Weak or Still Injured Quad

I've been dealing with a quad injury for a few months now. It's been diagnosed as the rectus femoris muscle. About three weeks ago I injured the calf on my other leg. Not wanting to mess myself up even further I took the last three weeks off from running and only biked a few times at pretty low intensity. The good news is that when I tried to run today my calf gave me no problems, the bad news is that my quad spasmed even more than it did when I took this time off. I did do some kicking in the pool yesterday which I had also avoided for the last three weeks. It does seem like swim kicking is a direct hit on the muscle but I took it pretty easy. After my short run with multiple leg spasms (1 mile) the quad feels fine. When I'm running it just kind of grabs for an instant and lets go. I can walk without soreness and go down stairs no problem.

So here is my question: Is it perhaps that I'm not actually injured anymore but that the muscle has gotten weak. Should I maybe start doing things like kikcking in the pool or biking to built it up, rather than to give it another couple weeks of rest?