+1 to putting your post types in a dedicated plugin
What you’ll want is to do something like what BBPress and Buddypress are doing.
In BBPress, default templates are provided. If the theme provides none, the defaults are used. All the themer has to do is add
add_theme_support( 'bbpress' );