This new amiitool generate both hashes correctly, but for write the tag must be careful with password, PACK0/1 and write order, check page 12 from this thread.
I uploaded a modified version of amitool, which calculates the hash missing. Use one key file (160 bytes), simply concatenate the "unfixed info" followed by "secret locked" into one file.
https://github.com/javimadgit/amiitool
Using 'locked secret' keyset.
'tag' format:
Calc hash of (0x000:0x007 + 0x054:0x07F) (52 bytes), put this hash (32 bytes) at 0x034
'internal' format:
Calc hash of (0x1D4:0x207) (52 bytes), put this hash (32 bytes) at 0x1B4
:)
It's ok, but read this "An NFC tag can be rewritten an infinite number of times until it is locked or physically damaged..."
For clone an Amiibo you need to set the lock bits, then the locked areas can't be rewritten