Help?

Me and my boyfriend have been together for 1.5 years. Hooking up for more than 2 years. Sex and stuff along those lines has always been great and pleasurable. I've always loved the way he can drive me crazy with his hands and mouth but over the past six months I've gotten a lot more sensitive to a lot of stuff. I can't stand fingering anymore because it's gotten oddly painful (all I can feel is how bony his fingers are) and I can only stand oral for a few minutes at most before I don't enjoy it anymore. The sex is still amazing and gets better everyday but it's just not "complete" without the foreplay. 

I am just looking for some advice to make it pleasurable again and I am out of ideas. I really am completely head over heels in love with him and he is so focused on making me feel good that I feel like he is disappointed when I just want sex. This is honestly more for him than me. 

Thanks! Xx