When sending via Calibre, use a Send to device structure such as this:
Code:
{tags}/{authors}/{series}/{title}
That should help limit the number of items in a single directory.
Probably better for performance, too. It's easier on the device to have 10 folders with 200 files each than have a single folder with 2000 items.