which rig I should bring down.
Could you be so kind as to define "rig", please?

If you are asking what "gear" or "cameras and lenses" you should bring while travelling, then here is some advice:
Just bring what you are most comfortable with and know how to use with your eyes closed!
It is no use to bring a camera that you hardly know or are uncomfortable with. You already discounted your Canon, so which of the 2 systems you have, you feel more at ease, that's the one you should bring. The same for your girlfriend.
Good shooting kid!