Bolt swap questions

Need some help here. Going from a 3006 bolt head to a magnum one. I have an older long action that had the locater detent/tab inside the bolt body which I have removed. I bought a new mag bolt head and I am awaiting the small firing pin assembly. Two questions. Will the new firing pin assembly work? I also bought a new baffle which I noticed has an extended groove on one corner which will not allow the bolt to go into the receiver. Will the old baffle be fine with the new bolt head? Thanks for your time and help.

Short and sweet, yes and yes!