Actually, Hawaii does not close until June 1st. In that building, smoking optional rooms are on the third floor.
Tahiti then becomes the concierge building for at least three and a half months. I don't think that all the decisions have been posted about which rooms will be non-smoking and which will be smoking optional at Tahiti.