I often use my own photo's for texture, after tiling them, and they are sometimes very high/long to get less repetition of the height of a trunk. Which, by the way, I also tackle by merging a few textures by world PF. So I'd say rectangular for tree trunks, your latter values. Of which I don't know if it would make much difference if it's 4096 or 4000, would it?