That mainstream Enfield scabbard with the stainless steel buckle you use--yeah, get rid of it. Here's an excellent copy of a simple Reb bayonet scabbard made by L.D. Haning. This style, which includes a small lead finial, is often associated with the Richmond Arsenal, though certainly other manufacturers utilized lead finials as well.
Bayonet Scabbard - Picket Post
$89.00Price