Checkout demands to press finish twice

-- url of the page with the problem -- : albertatacticalrifle.com
-- HikaShop version -- : 2.5.0
-- Joomla version -- : 3.4.3
-- PHP version -- : 5.6.10

I cannot get rid of the twice "Finish" press.

Here is my current checkout scheme:

What I want:
2 steps - login and then chose shipping method and payment method. Press finish and get the order created.

What I get:
Login
Chose shipping and payment, press "Finish"
I see the same step again (reloaded) with this time preselected shipping and payment. I need to press finish once more to really finish the checkout process.

In pictures what I have:

And after I press the "Finish" button I see the page reloaded:

And only after the second "Finish" press I can see what I really want to see after the first finish press.

So I have a duplicated step. How can I avoid it?

If I enable the options, then when I select a shipping method the page starts to reload. But since it takes the page a couple of seconds to be reloaded, I'm in time to start entering my payment options and ... damn!... the page is reloaded. This is even worse, the twice finish, because after the button press I expect the page to be loaded, but when I select I method then the page is reloaded unexpectedly.

I want to have one step without any reloads and twice Finish press.

P.S. Even with the options enabled the twice press is a must. Just checked.

Hi,
I would like to have an idea if the refactoring of the checkout will be available soon?
Thank you

Hello,
We are currently working on it to do it as fast as we can. The new cart and checkout system will probably be available through the following months.