Please forgive me in advance. I mean no disrespect.
Speaking only for myself, my old brain has a hard time following threads when other users insert different unrelated questions. Your rifle has nice groups but poor ES. The OP for this thread had good groups that went bad and we are trying to help him figure out why.
If you would start a new thread for your problem, I would be happy to help if I can. Hopefully others will too.
Just delete your question and repost it as a new thread. If you do that, I'll delete this reply too.
Ps - it's really terrific to see someone post a 7 shot group! I like that because it provides a great baseline that helps to narrow down the problem.