Hiya,
Yes, fix it like it is stock, keep everything in stock ranges, especially TPS voltage(with bigger cams drill a largerr hole in the TB if needed and/or slot the TPS .5-.6v), do the tuning as if it's stock. Then after tuning, ANY competent person can diagnose it as stock. IF the tune is right, diagnostics are the same.