Anon with the fear of fairy-types here; I ended up having a pretty long talk with my girlfriend, and she was actually really understanding? We decided to go see an earlier matinee, then got takeout for dinner and ate in the park while her clefable and my cubone got to know each other. Your suggestion about having him as a buffer was great; I’m still working up to a one-on-one meeting, but seeing how well our pokemon played together made me think things will work out.