Weather Module and Risk Factors - Primavera Risk Analysis

 I am attempting to add rain delay (Weather Event) to a 600 activity 4-year resource loaded construction project schedule that will also be 'risked' via Quick Risk Template (productivity/estimate uncertainty) and Risk Factors (project specific productivity/duration factors).  Since PRA will not permit the simultaneous application of the Weather Module and Risk Factors, I am approaching this as a two-stage effort.  The first stage involved stripping the resources and applying the derived rain delay calendar (weather event) to arrive at a P80 finish date.  Armed with this date, I then planned to adjust the budget labor hours of the original schedule