Stripe subscription with extra features (modules or addons)

Hello. I need to make a change to my current subscription system and I need to add the option for users to be charged on a subscription basis based on the features (modules) they want. Here's an example:

BasePlan1_2015: $10

Feature1: $5
Feature2: $10
Feature3: $5

At the billing renewal, a user with BasePlan1_2015 and Feature1 & Feature2 should pay
$10 + ($5 + $10) = $25.

So far I have two options:

Option1: Listen to webhooks for invoice created and apply Invoice Lines based on the features that were selected. For the first time the user selects their feature I will add them to the invoice and and invoice it then. Then I would just add at every webhook received the invoice lines required.

Option2: Create new plans on the fly. I would store in my DB the cost of each feature and when the user selects a combination of features, I would create the plan on the fly, put the total equal to the cost of the base subscription plus the features selected and then subscribe them to that specific plan. If someone removes or adds a new feature I would create a new plan (if it is not already created) and prorate.

I incline to the second option since it is more automated and most likely everything is done on Stripe's end when it comes to renewal.

So far these two are the only options I could come up with but I have a sense that there might be something else.

Does anyone used or is using anything like this with Stripe and has another option?