Senate faces new headaches amid flurry of last-minute tweaks on bipartisan Senate bill to counter China