You'll be fine with the earlier booking. I don't know if BA will check any luggage through on a separate ticket, but the AS/QX counters aren't that busy in the evening if you have to re-check any bags after clearing immigration and customs. Lines at security aren't too bad at that hour, either.