The fact it was surging and has now stopped suggests you may have pulled some crap through the mains and it has now cleared itself. Not uncommon on a freshly built bike. An inline filter may help, if only to give you a visual check to see if there is any crud coming down the fuel line. Worth dropping the bowls and checking the mains are clear, other than that you just have to see if it does it again.
Disconnect the wire from the neutral switch. If the light stays on, you've got an earth somewhere along the wire. If the light goes out, but comes on if you ground the wire against the case, your switch could be faulty.
Your oil light sounds like it's doing what it should, as long as it goes out when you rev it I wouldn't worry too much. Does raising the idle slightly extinguish it?