All perfect praise be to Allah, The Lord of the Worlds. I testify that there is none worthy of worship except Allah, and that Muhammad,
, is His slave and Messenger.
There is no contradiction between the two Fataawa.
The last Fatwa [Arabic] to which you referred is not as you claimed, that if you used the word “whenever” in your vow, then the expiation must be repeated; the Fatwa reads: “If you commit a sin many times, you have to repent whenever you sin, but you are not obliged to fast or expiate again because the wording that you mentioned does not entail repetition.”
It is clear that what is repeated if the sin is repeated is the repentance, and that no fast or expiation is repeated by the questioner, because his wording does not entail repetition, and the Fatwa did not mention the wording that you quoted at all.
Finally, we advise you to beware of Waswaas (Obsessive Compulsive Disorder), which is a serious disease that is difficult to get rid of if a person is overcome by it.
Allah knows best.