Man that sucks.
Did you get the block checked for warpage while the head was off?
All I can reccomend is clean all your mating surfaces really well and check them with a percision straight edge and feeler gauges before assembly.
I'm rebuilding the V6 in my 88 Runner after a blown HG now. Block measured out true but one of the heads was slightly off so they machined bolth.

Got the ARP studs from engnbldr along with the top end kit so they can be re used. Hope yours goes smoothly the second time around.