Budget includes watchdog agency for border officers