Fast-ion thermalization in non-circular tokamaks with large-banana-width effects