How long are you intending to stay and, more importantly, are you planning on getting the 12 month extension? Also consider if you start again on a Non-O your annual extension will be on the date when that Non-O expires every subsequent year, will that be an issue for you?
It's easier with a IDP as you don't do the test and the car and bike applications are two separate applications so two of everything, residence certificate, medical, etc.