Fine Gael and Fianna Fáil have edged closer to agreeing a government formation deal in a bid to avoid a snap election, with both sides now set to compromise on the issue of water charges.