I would say tickets + hotel (2-3 days only) shpuld be from DOHA and you may pick your tour plan from Egypt for two reasons:
1- cheaper (dont have to pay more money here and there)
2- you may change your mind and pick another place there.
3- so many Choices there
hope you enjoy it there