Dave, sounds like you have pretty much diagnosed , what you need to do. Mostly just "fat" removal . Looks like it has the makings of a nice piece. I might add that when you redo the front end, try rounding it more, less "slab" sided. Also , take the sides down some , exposing more of the barrel and ramrod .Make your lock and side panels , much smaller , closer to the shape of the lock plate . I do applaud your effort to go back and redo this into something better. So many times builders , get this sentimental attachment to a first build and are reluctant to go back and change it. Good luck , and keep us posted. Nate