Lembeh is better (&cleaner) then Bunaken as TwoFish's resort (I've been both), more friendly stuff in Lembeh, less people diving and better [and plenty of] food also.
The guide there was very good, I did just 5 dives there but I learnt a lot of things from him, I remember Hobo as his name but probably not spelt right.
Lembeh is perfect for macro pictures, the black sand makes better the photos.
btw I do not know with you had your contacts, ok I do not have a lot of practice with Indonesian names, I believed Rifka was a man but she is a woman...