With the warranty finished I took the plunge (and the risks to go with it) and went to MRC for a remap.
Results: 394ps, 531nm (389bhp, 391lbs in numbers I understand).
Hardware:
Revo uprated intercooler
OEM intake mod
Turbo technics inlet pipe
Sachs clutch
A bit more than I thought it would...