I have a A7 but it doesn't have that issue.

Mine is a 25-06.

the bolt is the same as you indicate so a stronger spring, and or a new bolt kit should do it.