Will we be able to create a single promotion that combines both a discount and a Gift With Purchase in the future?

Yes, this is currently being considered.