The "angelfish?" photo almost certainly looks like raccoon butterflies to me. The first mystery I'd peg as a parrotfish (look at that lower jaw!). Agree that the second mystery fish might be a grouper but it's really hard to tell.
Where were you snorkeling? i.e. what type of reef? Looks like lots of "mounds" and very few "branches." Was this in a lagoon?