AMENDED AND RESTATED WARRANT SUBSCRIPTION AGREEMENT