It sound like its diffenitly over boost at higher revs, this is a problem, you mension that the map sensor is fucked, well i'm sure that the ofac cars came with a small map sensor than that of the ofab the link below may help.
http://www.fiestaturbo.com/forums/vi...ight=ofab+ofac