You should get another drive and reserve it to Data. The cost is negligible and it really makes everything much simpler.

Optimizing your system or upgrading it just becomes a "trash boot drive and reinstall" operation, applied without a care in the world.