The chain whip probably is adequate as long as you're careful with it, and especially since it's not a "shop tool". I always use grease on metal to metal surfaces (AFAICR) like those splines, but your choice is as good (maybe better).