you're not that far away.
i am thinking about headers - i have a set of used bimmerbrake headers here that i might install before the ZHP engine goes in, but i would have to figure out tuning and i also would want to install some cats just downstream of the headers (i would feel wrong going catless).