AMENDED AND RESTATED FINANCIAL ADVISOR WARRANT AGREEMENT