Tory AMs join opponents and urge Boris to defer water cannon decision