Thornier second stage of US president’s proposal includes Hamas’s disarmament and Israel’s withdrawal