Well, we all are different. Personally, I believe I am a pretty sexually open person and I think you two probably can satisfy each other and both be happy with both scenarios.
For example, if he gives a sensual full body massage and then plays with your clit and ass and G spot – he is being soft and sensual – but I would wager to say that if he does it right, you will cum hard.
Edging. I’d say if there is one thing that will satisfy both of you – edging you sensually will make you both happy. You’ll cum hard and he’ll be sensual and you will both be happy.
Also, you deserve to be fucked hard and rough too, so don’t abandon that. He needs to know that so just be sure that communication is central to it all. No matter what you do – you need to talk about your sexual changes. It sounds like you guys already do this so just keep on doing it.
Good luck, honey.