I'd talk to Andy and see what he thinks. Personally I'd probably get it mapped now, and then remapped when you've got all your bits. If it's the ecutek map your going for, you pay for the licence and map first time, and then it's just andy's time/experience you're paying for from then on. ie it's cheaper once you've had it done once.
HTH
Dave