Update on the comp question: there are 50k extra bonus miles in my account this AM, labeled "customer service bonus." Looks like AA is being proactive; I certainly haven't complained to them.
ETA: Also got full EQMs for both the aborted trip and the rescheduled.