One option for cleaning up the main tubes would be Carbon Fiber Sleeves.

Several are available here (not pre-preg).

http://www.sollercomposites.com,carbon fiber,carbon fiber sleeve,Kevlar sleeve, fiberglass sleeves,carbon fiber fabric,epoxy,west system epoxy,nitrile,gloves,nitrile gloves,aramid,fiberglass,kevlar,tape,biaxial tape, biaxial sleeve

They also sell heat shrink tubing. I'm not sure how well it works with oven cured tubes, but it apparently works quite well with 2 part epoxy.