Sounds good
Be interesting to see how it takes to the injector swap as the Cosworth eec differs from most in having the injector slopes set to the same value and I've wondered if this makes things simpler in not having to figure out the correct low slope.
The MAF shouldn't be a problem other than having to go to the States to find a suitably sized replacement.