Jim, Cross piece or quillion looks pretty straight to me. The hang up seems to be in the mortise slot.
And Gill, that is a pretty well thought out bayo and scabbard!