In this paper, we deal with the performance of non-orthogonal Amplify-and-Forward protocols over block-fading channels (BFNAF),where the source retransmits the same data during cooperation in order to increase spatial diversity. Despite the additional diversity degree that is offered by the channel, channel inversion amplification schemes are not always able to increase the diversity gain of the system due to the high correlation that can result in the two simultaneous transmissions. It is proven that this diversity loss is related to a poor source-relay link that via the relay amplification process affects the third available diversity branch corresponding to the second source transmission. In order to resolve this problem, we integrate a fixed gain amplification factor in the BFNAF scheme which efficiently uses the additional diversity degree of the channel and recovers the diversity loss associated with channel inversion schemes. This new BFNAF scheme offers spatial diversity benefits with high reliability and is an appropriate solution for Amplify-and-Forward scenarios in which the source-relay link is not stronger than the relay-destination link. The diversity analysis is based on some well-defined capacity bounds which follow the diversity order of the true capacity and enable theoretical derivations. The enhancements of the proposed schemes are verified through both theoretical results and computer simulations.