Justin Upton to sign new five-year deal with Angels