Unmarked Spoilers
Since Homura separated "the Madoka that was before attaining divinity" from the Law of Cycles, is the Madoka post-rebellion a Mahou Shoujo?
I'm talking about the Madoka that shows up as the "transfer student" at the end of rebelllion. And being a magical girl in that context means having one's soul in a soul gem.