I've had both a CZ 452A and T-bolt. Still have the T-bolt. It has a better fit for me, is perfect with a gloss M8 4X and a joy to shoot.
YMMV
I would do this if I could have the T-Bolt I shot as a kid. Belgian made super grade with really nice wood. Been looking for another but almost never see them for sale.