I know very much how you feel, as I do both tantric massage and escorting and go out to bookings with a totally different mindset depending on what type, and behave differently too. As a masseuse, I'm a mysterious goddess who brings them a sensual experience and then vanishes into the night...so too much talking and quite in control. For GFE, I'm super-flirty, chatty, warm, seductive, naughty etc. etc. I don't really like to mix booking types.
I had a very awkward situation yesterday when I saw a client whom I presumed wanted a tantric massage booking, but turned out wanted GFE with tantric massage. Eeeuuch!!
I think if you see this gentleman again, go out the door with your 'escorting' head on, rather than 'masseuse' head, and get him to pay you at the beginning of the appointment for whatever kind of booking he'd like that day, or ask in your confirmation mail if you're doing massage or massage+gfe, because you want to know what to wear/pack, or something! I had a client that I started doing massage with, and now do GFE with massage for, but every time I go out to the booking I prepare as for an escort booking, not massage
Or you could just say that you're no longer escorting as your bf doesn't like it and am only doing massage...but that means that you can't turn him into escort client