Your current Non-O is based on what? For the Non-O retirement it's really just the 800k for 60 days, plus the usual (passport, copy of passport pages, 2 passport pictures, application, 1900 baht, and time.)
Has nothing to do with his question though. he's asking about the 21 day requirement of being in an approved country before entering Phuket. That was dropped Oct 1st.