Renegade,
Your Mauser looks nice. I would suggest a Timney trigger, you can get them for around $50.
Also on the headspace you can take a sized case and put scotch tape over the casehead and chamber it, keep adding layers until the bolt is hard to close. I cant remember the thickness of each layer of tape but if it takes more than three you could have excessive head space.