btw it seems that the bach that haleivi referred to –
“As for your Stira in Rashi, the Bach has an approach that explains Rashi to hold that it goes by the Begged. Where he says, he might put it on at night, it means, he might use it as a night garment.”
addresses this ‘stirah’, so maybe i wasn’t so far off the mark.
But if you look at rashi on 25:, it is clear that he circumvents this potential contradiction