Get non-O before going. It's pointless to come on the wrong visa if you already know that you want the non-O. The possibility to switch is there for those who change their plans later. In your case, the rules and conditions at various stages are better suited if you get the visa first. For instance you don't need a return flight when flying, and it will be easier to open a bank account.
well, not completely wrong. There is an unofficial "limit" of that number of days, in the way that entering on tourism-purposed visas or alternatives could be more difficult once you get beyond that. But it's not set in stone.