I'm an Aussie that had an O-A too. Just do the border bounce. You'll get a free year with no hassles. Don't forget you need a re-entry permit if you leave during the second year.
There's no limit on visa exempt entries either. You don't need a visa if you are in for less than 30 days and out for say, 30 days. You are a tourist. I have a friend who came every other month for years with no problem.