i'd go with MAF over SD. Doesn't really matter which MAF, just the biggest one fits well on your setup (so probably SLP 85mm or Z06 one). tuning will be required anyway, so might as well recalibrate MAF while at it and have it work perfect in any situation.