Best Practice/Direction on Reconfiguring a Bundle

I have two items related to reconfiguring bundles and how to handle existing subscriptions and assets. 

Currently we have a bundle configured as below:

1. Bundle Header (Parent) - Product A (renewable subscription that has a price associated with it)
   1. Child Product (product option) - Product B (one-time asset that has a price associated with it).

When added to a quote, since the child is not flagged as Bundled, pricing sits at both lines. The business now wants to re-design the bundle. They want it to look like the following:

1.  Bundle Header (Parent) - Product C (renewable subscription that has a $0 price)
   1. Child Product (product option) - Product A (renewable subscription that has a price associated with it).
   2. Child Product (product option) - Product B (one-time asset that has a price associated with it).

Pricing would sit at each child product line. I was thinking I could just reconfigure the bundle by creating the bundle header and adding Product A as a child and then Product B as a child. And remove the child option (product B) from from Product A (basically breaking the original bundle apart).  

But my concern is existing data that was sold under the current configuration. Do I create subscription bundle headers and then realign the current subscriptions and assets to the new bundle header (adding the Root ID, Required By ID, adjust the product option information on each subscription and asset)? If so, what are the possible risks to amendments and renewals? If this is not the best approach what would you suggest? I can’t create new product codes so I need to use the current products and product codes. 

We have a one time subscription Service product that is part of two bundles. We want to break this apart from the bundles to make it standalone and have it only added on new sales quotes. This Service product is a one-time subscription product.  

For new sales, I need to hide the options within the two bundles and have the product auto added. For amendments, I need the options available for the products being revised but if we are adding one of the two bundles for the first time we need the option for the Service product hidden in both bundles.  

How would i build this? For new sales I am thinking a product selection rule to add the standalone product. For new sales a product selection rule to hide the options. For amendments, how would I approach this? 

Thank you.