Have you see the ACZ ultra stocks if you need something fully adjustable. Nothing to do with me but I have handled one and I was quite impressed with it.
Personally I would get someone like Warren Edwards to fit an adjustable cheek piece with your stock I did this with my CS800 , although Paul Wilson did mine when he was still making stocks.