Henry Bonilla faces redistricting woes