Fabien, the climax of this aria is most definitely the F# at the ending on the last "e giubilar mi fa". Taking that out makes it almost boring at the ending. When you sing this I feel like you should be singing Figaro instead of Almaviva for this reason. Also, this is a bad ass revenge aria as opposed to a kind hearted count singing to his friends in the audience. Try Non piu andrai, it'd be nice to hear that in your voice.