For $3.5g I'd consider B16A swap or turbo D. H22 maybe, but it's a little more stuffing around I think.