If you're going to turn your hand into a bluff (which is fine imo ) you should be shoving almost all rivers, including those that improve you. This would be based on the admittedly rather large assumption that almost any hand he wants to get AI he would do so on the turn.

I'm not even sure that makes sense, but it's bedtime so i'll go into more detail in the moro

That said i'd c/f the turn rather than b/f, and i'd never CRAI.