Baseline vs. Forecast Schedule with EVM

Hi, I’d like to gauge opinion re: Baselines. We use MSP for Earned Value Management and have had difficulty simply using the MSP baseline function out of the box. Inadvertent deletion of tasks/resources also removes the baseline for those activities, which pollutes the EVM baseline. Also the baseline can’t be easily re-rated. My organisation therefore uses a two-schedule system, where the baseline is locked away and a separate, forecast-schedule is used for monthly updates. The dowside of this approach is that when a baseline change is required, both schedules must be changed simultaneously....a time consuming process.

Does anyone else use a similar system, or have you solved these problems another way?
Regards... Steve Mac.