This is a little late for msubryan -- sorry. But, I figured I would weigh in for others considering Bonaire. I found Angel City the best dive, by far, on Bonaire. Actually, it's in my top 3 "best dives ever."
Of course, these things are always a matter of personal preference, but I think...