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 Merrick's Custom Leather.