I agree with everything you did except getting her the aspirin. Let her get her own damn aspirin, lol
Next time she asks if you are happy she has a headache, or similar manipulation, I'd ask her if she was happy she had a headache, and what could she do differently next time to avoid one?
Yeah, assertive. Agressive? NOPE...it's not, no matter how much she might want to think it is. I know, others will say don't engage, but I swear, I don't think the partners of A's should have to keep their trap shut when the A's never do.
Don't walk on eggshells, they smell !