This bit of code certainly seems to help things:
add_filter('request', 'hierarchical_post_fix');
function hierarchical_post_fix($args) {
if (empty($args['post_type']) || $args['post_type'] != 'custom-post-type' || empty($args['name'])) {
return $args;
}
$args['orderby'] = 'parent';
$args['order'] = 'ASC';
return $args;
}