I'd go with the longer tail -- could you take a side-view pic so we can get a better idea of the true proportions?
Skyrays and Fright Streaks both have pretty thin wings compared to flapped birds, and fly pretty well -- are you sure the airfoil isn't right for non-flapped?
(Skyrays and Fright Streaks also have a bigger wing than a Ringmaster...)