I have no idea about when your rifle was made, but to help with the barrel wedge, you should try bending it slightly.
This can be done with a good vise to hold it with about 1/2 of the wedge sticking out of it. A good tap with a hammer will bend the wedge. You don't want a lot of bend, just enough to tighten up the assembly, so try it in the gun before you pound it again. Don't over do a good thing.
When installing the wedge, place the high point of the bow down (away from the barrel) so it pulls the barrel down into the stock as it moves thru the barrel tenon.