The most popular folk etymology always sounds plausible. Your theory makes sense, except that the stick/ broom sense of faggot is what got the woman's work sense attached, according to most etymologists, anyway.

But you raise an interesting question. Did the flaming part of "flaming faggot" develop later because faggots are sometimes burned as torches? Or is it a coincidence? I have no idea!