Surely if you can't persuade a current partner that you are safe with a gun there is a pretty big problem with the relationship and that should be looked at,
The ammo needs to be in a separate case in the hold and declared so they can add an explosives tag to it. Put knives or anything else that might upset people in the case with your rifle. That always works for me.