It seems you are worse off than we were. Our Supreme Court was able to neatly disambiguate sex and GR without undermining either, whilst drawing a polite veil of silence over the fact that this renders acquired gender (our rough equivalent of GI) completely irrelevant for all practical purposes (men and women are now treated identically in UK law except where the law specifies otherwise based on biological sex).
But by having a PC of GI, your law arguably endorses a view (very popular with TRAs here) that anti-discrimination law for trans people shouldn't just be about preventing arbitrary disadvantage relative to an (otherwise similar) non-trans comparator, but should also punish any treatment of the trans person that's based on their biological sex rather than GI.
I'm sure a clever and motivated judge could wrangle a workable interpretation. But are they? And will they?