More Authorize Only Problems

I have previously had a problem getting my authorize program to "authorize only" rather that auto capture.
(I had previous topic \http://www.hikashop.com/en/forum/4-how-to/54213-authorize-automatically-capturing.html)

Previously when I upgraded to 1.6 it stopped authorizing only and I fixed it by using a previous copy of the authorize.php file and uploading it. It worked fine. Then today I upgraded to business hika 2.0 and now I am back to it automatically capturing again. Then I tried to upload the the previous revised file (maybe 1.5) and orders did not go through at all. I went and reinstalled hika2.0 and it is now back to working ok - but still auto capturing. I do have the check box set for "no instant capture".

(Note - I am using the sim mode)

Before I try that - this is what I did...

I used akeeba backup to revert my site (a few days previous) to the hikashop1.6 installation. All is ok now.

Question - After I save a copy of the authorize folder in hikashop 1.6. Then I can upgrade to hikashop 2.0 and then overwright the hikashop2.0/authorize folder with the hikashop1.6/authorize folder in the plugins folder. Would this be an ok way to make it work.