Yeah, I'd ditch the C&L and get a Pro-M as soon as possible. TONS of people have problems with surging and C&L.
As far as the 24#ers go, I would stick with the 19s unless you're having issues. I'm no expert on fuel injectors though, so take what I have to say with a grain of salt. I'm sure...