So my Gen Kingdom is running into a problem of having a much larger kingdom waving us when we had NO WAR in our kingdom name. They basically blindsided us.

After multiple message exchanges with their king, they won't back down.

Latest msg from their king is:

To The Honorable King XXXXXXXXX
push that botton? are you scared?
Signed, King XXXXXXX the Sorcerer of XXXXXXXXXX

Anyways, we're stuck in an hostile exchange atm. So I need someone to check/correct the calculations.
I think now the non-TM attacks count the same on the conflict meter as the TMs, am I right?
Decay rate still 15% per month?

Last month they are on aggressive:
7 hits (6 TMs 1 learn)
I count that as 14 hits.

We made 5 hits back against their king in normal stance.
I count that as 5 hits.

Month change.
9 * .85 = 7.65
I decided to round down and carry 7 hits over.

This month they are at normal.
There's a total of 5 hits so far. (all TMs, I'm not sure if this matters still)
So that puts their total for this month at 12 hits.
We made 4 hits (all TMs)

so we have 7 hits remaining while keeping the war button right?
And if we decide to wave after the month change, it'll be like 5 hits remaining assuming they don't hit anymore?