When he moved your kisser button did he move your peep as well? He should have. And I agree ditch the kisser button, or the peep. You don't need both. Most people don't use a kisser button correctly any way, so I would ditch that.

You should not have to move your form to match your peep sight. You should be able to draw comfortably with your eyes closed, then open them and the peep should be right there lined up with your eye. If it isn't I would move it.

However if you run of sight adjustment changing your anchor is a solution, it will feel funny at first, but you will get used to it. Lots of blind bale shooting will help.

Good luck,
Paul