Les Myers can add on an adjustable comb/butt pad for you; though I'm not sure to what level of "fitting" he routinely does. Andrew out at Silver Willow does fittings, though I believe he has already departed for the season.
If you are up for a road trip, there is an excellent fitter (and range) in Polson, MT; about 6hrs from Calgary (S&S Plus). They have the room, that they can tweak your stock, then you get to go out back and shoot it. Tough to do in a city.