Mazda revamps CX-5, ditches diesel on comeback road