Iran and Oman draft waterway deal while Trump rejects Tehran's control and transit fees