I like to see the leaves reaching up to the sun - i call it the sundance. So in that respect, i don't think you've done anything wrong.
I like to see the nodes about 2-3 inches apart (in height) - I think getting the light at the right height to encourage stretch at the beginning is important, but too far away and you've got an overstretched plant with a weak stem. I use the back of my hand for a heat test (1minute under at canopy level and if i can feel a slight burn - its too close).
And sometimes it just goes down to the plant and it might just decide to keep short.
I wouldnt worry too much about tucking leaves at the moment, thats the kind of thing you'll do later on when you have some buds.