I don't see Ryan giving up his Budget Committee for Majority leader. For Speaker, yes. McCarthy is the whip, he is the traditional 'next in line' for the leaders post. I'd bet he gets it, since the establishment still runs the show.
I think this will be the 'test'. I like Hensarling for Speaker and I hope that he has enough House backing and his own Majority Leader in mind to oust McCarthy too.