At the ticket desk a contactless card will work. There is no specific reason why the vending machine couldn't do the same, just needs to re-programmed to accept this.
You can also collect the return leg ticket at any time that you like including right now before you set off. It doesn't have to be on the day.