Hamilton, Angels agree to deal