Briley can do it all, including major gunsmithing, custom guns, subgauge tube sets, etc.
http://www.briley.com/
They can take fixed choked guns and thread them for choke tubes. They make choke tubes for just about every gun already threaded for choke tubes.
Carlson's is another:
http://www.choketube.com/choke-tube-installation.php