Rek'Sai + New Black Cleaver Build Tips

So, I'm a big fan of Rek'Sai. She's one of my main junglers, I'm very comfortable and confident playing her (except against who could be banned forever and I would not shed a tear). That said, I haven't played her since the latest patch, since I'm not sure how to build around the new Black Cleaver.

This was my previous build: Which seemed to work out really well. Warrior gave a good early damage spike, and I then started building into tank after finishing boots. After finishing my first defensive item, I'd go into Hydra if we were ahead, my second tank item if we were behind. Cleaver was always my last item, and I really liked it. It gave me more CDR, which Rek'Sai appreciates, and I liked the sustained damage playstyle, where I'd sit in combat and wail away on entire groups of enemies with Ravenous and Queen's Wrath.

Unfortunately, the new Black Cleaver throws things off. While I can deal with the loss of the flat pen, and the extra tankiness and rage passive is nice, it overcaps me on CDR since I take the 5% CDR mastery in the offense tree, leaving me at 45% CDR.

So to other Rek'Sai players out there, any advice? Should I drop the Sorcery mastery and take something else? If so, what? Do I drop Warrior for Devourer? The AS is nice, since my build doesn't give any other AS outside of her ult's passive and 5% AS from the offense mastery tree, but it lacks the early game damage of Warrior and puts off my CDR. I looked at Youmuu's, but Rek's already kind of squishy, so losing the health of Cleaver seems like it would leave me too fragile, and I can't be sure I'd remember to use the active. Plus, to get the most use out of Avarice Blade, I'd either have to push Youmuu's to early game or build Avarice and sit on it in my inventory for a while. I've also considered Frozen Mallet, and while the health and permaslow is nice, it lacks CDR and Rek'Sai's ratios are already not great - even the small AD drop from BC to FM could be a problem. All suggestions are appreciated - I want to play the Queen again.