I think that importing the words from Bill C-16 on gender expression and identity would be helpful in the current bill. I don't think there's currently a conflict, because this bill is about the federal government's exercise of the criminal law power in restricting a harm.
Regulating what counts as health care is the role of the provinces, and they are fairly unanimous about the fact that conversion programs are not health care; but the kinds of helpful counselling and the entire medically sanctioned process of gender-affirming transition care for trans people is validly medically supported health care. I see no conflict.