Having read all your posts about your problems or issues, why not just get your engine rebuilt with stronger internals, and get remapped to the correct software  

 .  It seems your looking in the months/years to get big power.  Don't forget the ED30/S3 engine is only a little bit stronger than the AXX, it may cost a little bit more than a engine transplant, but hey, look forward.  Also, as a few have said, if you choose the Golf R engine, it will not be a problem with your box  

 It's what I will do when mine lets go