PSI Performance is a new tuning company but the guys are well versed in BMW and MINI ,they are based in Yoker Glasgow and may be worth contacting them and see if they can help with a remap
A Reeve also get good reviews but based in England