Tracking trials - non subscription purchase

We previously had a hard paywall, meaning when users started their trial, they also accepted that they would automatically convert to a paid sub unless they cancelled beforehand. This triggered the rc_trial_started event, and later rc_trial_converted event.

We decided to experiment and move this hard paywall as we saw drop-off from people not wanting to commit. Now users can start a trial, and at the end of the month they’ll be prompted to upgrade to a paid sub (if they want). 

The issue is now rc_non_subscription_purchase event is triggered when they start their trial, which is throwing off all of my reporting, particularly trend analysis for trial conversions. Is there a way to continue using the rc_trial_started event so I have continuity in my reporting?