If you will be going through a barrel change delay and expense either way, I would go with a custom barrel. I have had good luck with Benchmark and Bartlein.

Some factory barrels may shoot nearly as well as custom, but they usually foul much worse.