In my chapter of the upcoming book THE KING OF STONEHENGE, I've definitively taken Badon away from Arthur and more or less associated it instead with Modred.
I know, I know (I can hear your screams from here!): "Blasphemy!" But this is where my latest research has led me. I would ignore the evidence at my peril.