MPCC++: Model Predictive Contouring Control for Time-Optimal Flight with Safety Constraints