Sounds like you've covered the basics in your service, so it shouldn't be any of those parts at fault. I'd be looking at replacing the cold start injector and possibly the coolant temp sensor as I think this sets the enrichment for cold starting (anyone correct me if I'm wrong).

Failing that, like you said - go over to EFI. Would probably be the best option for the longer term!