Dangelang

I bought a 99 T/A with a STS kit. Previous owner pinched oil return above trans and ended up cracking 2 pistons. I've decided to drop a lq4 in it's place. Not sure if I should use the stock ls1(853) heads that have been ported and polished or use the 317's. I plan on doing it up with arp rod bolts, head studs, ls9 head gaskets. It was setup to run around on 5psi and with a flip of the switch hit 12psi. Also putting in a ls6 cam. I think that is everything, does this all sound bout right?