Another vote for the short block. Last one I did, I did the short block itself at cost to keep the price reasonable. Still made crazy money on the job. Subaru engine work is EASY. Login to read more.