I'm trying to convert greater stone golems from 3.5 to pathfinder and I'm worried about the 42 hit dice. With the new BAB of constructs that would give them an attack modifier of +53. It seems like, from the monster advancement table in the pathfinder bestiary, that a greater stone golem should have around 28 hit dice instead. Would a 28 hit dice stone golem be a CR 16 creature?