My first hand observations on tedders:
We have the same problem with the 4 basket tedder, vs. the 6 basket tedder we used to have, where in this comparison, our 6 basket worked as good as your 2 basket:
The 6 basket was a 6 meter manual fold machine: we bought it because it was cheap, nobody wants a manual folding 6 basket anymore because its truely such a b*tch to fold !!! Even for me as a young healthy lad. But because my father is 65 and has arthrosis (spelled right ?) we bought a 5 meter, 4 rotor, hydraulic fold Vicon because he just physically couldnt do it anymore.
To keep the width of the fold up machine within proper roadgoing dimensions (i'm in europe, remember

) they use the same mid section for both tedders, while the rotors are much larger in diameter of the 4 rotor 5 meter tedder, than the 6 meter 6 rotor tedder: that makes about 25 cm per rotor !
Therefor, the 5 meter tedder, has an unequal distance between each rotor, the mid rotors are at closer center, than center of each mid section to the outer, foldable section. This effects that it will also throw more hay right in the middle behind the machine, than on the edges of its working width.
Our 6 meter machine, with the rotors on equal center distances, didnt have this problem.
I think you should look at a hydro fold 4 basket tedder, and keep an eye on the rotor centers to avoid this problem we have with the Vicon.
Especially when you say you bale 10.000 bales a year: We dont use small bales but plastic wrap everything in 3'x3' square bales, so 10.000 small ones would be about 80 big ones. You guys have quite some ground to cover: Personally i would never want a 2 rotor tedder to do our annual 80 large bales !
About disc vs. drum mowers: I was happy to step up to disk mower technology 2 years ago, but now i'm thinking of going back to drums:
2 years ago i bought a 2 meter 3pt hitch disk mower, a Krone AM 202 without conditioner. (when making dry horse haylage, we dont want a conditioner because when tedding a conditioned crop 3 or 4 times, the hay will fall apart in dust, which means a lot of crop loss)
Last cut the weather wasnt still enough to allow for a 3 day drying period, so we had to wait, and the grass was tall.
The disk mower plugged (i'm told a conditioner will cure that because it plucks the grass off the mowing table, but for hay we dont want conditioners) and left a very uneven stubble, inbetween the disks, there were stripes that were 2 inch longer than the rest.
For these reasons i'm thinking of buying a JF CMT 245 pull type drum mower: These mowers had trouble with the main belt drive and therefor are very cheap, but if you dont use the conditioner, they'll do fine because then only half the power is transmitted.
Next to that, the general build style of a drum mower is a lot more robust, and there are less blades to exchange every year. It will also slide easier over rough horse pastures...