I had that issue with a 2 year old cat I adopted 5 years ago. I would wake up with his drool and scratches all over my chest because he would come lay next to me and "massage" me in my sleep trying to get attention. After getting his front paws declawed, which yes I realize most people think is cruel, I no longer had this issue. He stopped fighting so hard for attention, but didn't stop entirely. And of course no more having to deal with cat scratches all over my body just because he was trying to get some loving. I also had the same results with a kitten I adopted last year.
Others may have some other suggestions, but for me that is what worked with both of the cats I have when they got a little too pushy and started causing more anger than joy.