Your first plan looks good to me. It depends on your interests though and I would try to take advantage of the direct Aitutaki-Atiu flight to avoid backtracking to Raro. It's only once a week, I think a Tues or Wed.