I looked at your videos, but not sure what pigeons you have currently.
Homers (white) are pretty much the only type for me. Not for racing, but for loft flying and tosses. I also do like High flyers. Wanted some, but never got around to getting any.

Was looking into some Iranian High Flyers. They were Beautiful birds, All White with Black Wing Tips

Rollers, I have no interest in

. They would be hawk food around me. Fantails fall in same category. I do like the way both look, but they would need a large aviary, to be comfortable in. Freeflying not ideal in my area for those.
You do have multiple lofts, and they are really nice

(seen in video)
My thinking If I was in your circumstance;
Keep the high Flyers, and see if you could find some more hens.(2 or so) Sell off some of the extra males. Keep pairs.
Your adjacent loft, keep your homers. If you get young, then there is no way knowing what ratio of male female you will have when grown. You don't need to keep the fantail drop birds in that loft, since you are not racing. Your fantails and whatever other breeds you may have can be in adjacent loft to that one.
Trap doors are easily retrofitted to your current opening. You can get the bob's and install. I think you should have them on each loft. This way you can control which set of pigeons you want to loft fly, and when.
I would loft fly/train each breed separately, as well as let all loft fly together when you want to.
Take the homers on tosses of varying distance. Not sure the homing skills of you particular high flyers. I would take for trial tosses, but not very far.