2013: Make or break

I'm starting to wonder if maybe my calculations are a bit off on the above example.

In that example on a Jh river for example, our actual number of value hands on the river should be based on our entire range, so all sets (222,333,777,888,JJJ = 15 combos, 78s 2 combos, and all flushes (A3,A5,A6,A8,A9,AT,AQ,AKhh, KQ, QThh, 89hh = 11 combos) = Total value combos of 32.

So if we have 32 value combos on a Jack of hearts river, then:
bluff combos = 32*0.4 = 11 bluff combos.

We have 17 value combos on a non heart brick, then:
bluff combos = 17*0.4 = 7 bluff combos.

Anyone have any thoughts if this seems more reasonable? I don't claim to be a GTO expert, so just trying to work through this stuff!