The G84 is correct for what it is (rigid tapping). IF you are using it with a floating tap holder then you must allow for the transition of the spindle from Cw to CCw. That way when the tap gets back to the top it does NOT have any spring load to it.(not always possible)
Also do not use it IF you are using spindle sync as the sync part is broken in mill ( last I used it) Turn OFF spindle sync and use the programed S speed.
IF you are doing tapping in MAch3 I would just setup a Tapping Sub and use variables to program it. Works Everytime and you can specify feed and retract to account for the dwell.
(;-) TP