A new deal has been agreed which will see more than 2,000 new bikes and e-scooters hit the West Midlands streets from April.