Bipartisan bill would create NSC position to oversee 'Havana