FORM OF AMENDED & RESTATED WARRANT AGREEMENT