You want to seriously consider a aftermarket ecu with shed loads more features as well, as opposed to the std stuff modded, depending on how far you want to go(extra facilities) you won't be limited by the ecu then, prices can be very good as well, especially with THREE maps costing £275(for all three, NOT each), if you don't want to do yourself which is easy for some.
I can give you then number of someone who could do the whole job, including if wanted a new loom, with all the extras added for a later date, he makes looms for some very special people using 44 wire and 52 wire, been doing it for around 30 years.
tabetha