Replying to Goggles for POC Receptor BC

Been a little while since I've been on here, but I'm looking for some help/recommendations for goggles. Helmet is a POC receptor BC MIPS, size XL, I think sizing for this one is different from that of the receptor bug. Currently have electric EG2's, great goggles, but getting old/scuffed and they don't fit great with this helmet. I'm not sure if they are too big and push the helmet back, or if I just don't sag them enough, but I'll typically end up with a sizable gap at some point. Any suggestions greatly appreciated, I guess the only other thing is that I would prefer goggles where the lens is easy to swap as I will be night skiing a fair amount.