The tree looks like one of the cardboard paper towel rolls. Your first version wasn't far from the mark, though, from what I can tell. Just move the highlight to a position farther down on the cylinder and make sure the shadow follows the contours of the tree-spiral and isn't just at a 45-degree angle.
The leaves on the left and middle look like viable options, while those on the right look like their size is too fixed to convey them as being a surface wrapped around the leaf-blob's contours. The left leaves look a bit odd in the lower bit, though, they lose all conveyance of shape there and break down into dot-dithering, whereas in the layer above you have beautiful portrayal of the light hitting leaves and the leaves casting shadows. Once you fix the left one, which of the two (it or the middle) you pick is mostly a stylistic decision, I think, and thus up to you.