I'm just a simple layman, but that sure sounds like some serious gymnastics. Again, why would Paul dictate rules applicable to a thing he would in a short space proscribe? Why are the angels mentioned limited to Church Angels? The text does not in any way require that. And since it does not, the statement that a woman's hair is her covering makes complete sense.
Sometimes we need gymnastics to extricate people from the tangles men sadly create for themselves. The non prima facie reading of this text has created the tangles.
The idea of long hair as a covering is just another tangle (tangled hair!). The apostle says that if the woman is not covered let her
also be shorn. To be shorn is to have the hair cut close to the scalp, i.e., to have short hair. It would be redundant to say, if the woman does not have long hair let her also have short hair. The text clearly speaks of an artificial covering. The long hair is brought in later to make an illustration from nature to enforce the need for an artificial covering.