If it was just Revo and APR then Revo all the way imho.
If you want we can provide you with the Revo remap mobile or you can come to our workshop and get the works, full diagnostics, rolling road session, custom mapping via the SPS switch with before and after rr graphs.
Nick