The entire reason "pan" exists is because "bi" is a term that implies there are 2 genders. Nowadays Bi people reject that notion, but the historical context and the original meaning of the word are clear. For that reason pan is obviously a more inclusive term from the get-go, although whatever boundary seemed to exist between the two terms is very murky now.