Well in all honestly, you know better that most people on this forum what would work best.
Have you tried to group the rifle? Pick weather you want to shoot it with the bayonet extended or not, then shoot it off as stable of a platform as you can. Believe it or not, the bayonet can influence the bullet impact by about 10 inches at 100 yards. I sighted mine in with the bayonet in.
Some rifles have very crummy looking bores and shoot well. Others appear to have nice bores and don't shoot as well as the ones with "bad" bores.
There is no such thing as a stupid question, only stupid people.