I don't know if SpaceX will do aviation other than the long-haul Mach 20 BFR type, but Elon Musk has expressed interest in high speed electric aviation as well. If Tesla and/or SpaceX end up being too successful, he'll probably guide one of them to that space.