You entered the U.S. legally, but your status has lapsed due to this comedy of errors? I think you should consult an immigration lawyer to be sure of any consequences, but my inclination would be to re-apply for an adjustment of status based upon your marriage.