I've got Riff Raffs in a Faded, and I also reckon that they're what you want for the music styles you mention (quite close to what I use them for).
I'd better tell you this though - if you replace the stocks with Riff Raffs, the RRs will not initially seem less "trebly". My memory of the change was they were as bright as the pickups they were replacing. What they did address was "thin" - they added a bit more punch and, like all BKPs I've experienced, they added a touch more "clarity".
The other thing is, I selected the guitar for the pickups, which I already had. I tried several of them before I picked this one. Acoustically it had a louder, warmer, more resonant tone than the others. Some of the others sounded (to me) quite brittle and without much body. Riff Raffs in those wouldn't quite have done it for me.
Even though I already had the pickups, I do sometimes wonder whether Stormy Mondays might be better for what I want - I understand that they do nice raunchy/rock. But having said that, I do use the volumes and tones a lot, and I can get the Riff Raffs in this guitar to sound smoother and more mellow - think the Allman Brothers stuff off Live at the Fillmore East (which is what I think the reference is for the "Stormy Monday" pickup name), or even Paul Kossoff's live tones. Another one it does nicely is Eric Clapton's Beano tone. And then when I want to go off into Angus and Malcolm territory, I just open up the guitar controls and I'm away. I have even used the guitar for stuff I'd regard as more "metal".
Overall, as long as you haven't got an overly bright and thin sounding Faded, I think Riff Raffs will do you very well. If you have a bright/thin one, then I think you possibly might need more advice (maybe contact BKP themselves?)
EDIT: Welcome to the forum, by the way! :D