Plus: Angels re-up with catcher Heineman