Trying to line up Baals to use the templates is both hard and risky as the enemy will line up badly and so he can counter assault.
I would prefer preds over vindis, just as you can choose to sit back, they are better at antitank and also they are cheaper.
Then I think having only 15 men as scoring then maybe the priest could be worth it.
It is a toss up between another razorback and keeping a Baal. I think the Baal is worth it just as having three improves their value.
Then yes shield acts a bit like the
kff. Psychic powers can happen from vehicles, non shooting powers at least. Vehicles get cover saves which is reason for taking it, hopefully loose troops will be in cover already. The psychic hood also works inside vehicles.
Good list, good luck