Bills reach extension with defensive centerpiece, but Stefon Diggs drama looms