I think I'd replace one point of your bluff catching rules.

1. How strong does he think his range is? (I would replace this with does he think I will fold. If he thinks you will fold is already...