90° Head Canned Cycle Trouble

I'm working on a post for running a 90° head in a HAAS mill.
Luckily Haas has a great video and guide as to how the g-code output should look.

https://diy.haascnc.com/sites/default/files/Locked/TOTD/G18YMinusDrill.txt

I've gotten my post to put out code that makes sense to me compared to what Haas has on their website. It goes to the X,Z coordinate as i expect, but then instead of pecking in the -Y direction, it decides to peck in the Z direction as it normally would without the G18 command.
I am pasting the output from my post below.
Can someone please let me know what i have wrong, or if there is a machine setting somewhere that might need to be changed to enable pecking in a non-Z direction?

MY POST PROCESSOR OUTPUT

O0
G40 G80 G90
T1 M6
S586 M3
G54 G0 G90 G17
X1. Y2.
G43 Z2. H1
Z-1.
Y0.1
M8
G18
G83 G98 X1. Z-1. Y-0.5 Q0.125 R0.1 F2.0
Z1.
G80 G0 Y2.
G17
M9
G28 G90 Z0
M5
M30
%

I would guess that you need to replace the G17 on the G54 G0 G90 G17 line with G18. That is the line where the coordinate system is being activated--hence that would be the line to activate X/Z coordinate system (G18). You don;t need G17 in the program anywhere. Take that with a grain of Salt, because I have no first hand experience with a Haas 90º head.

R

What's the control version? They don't all support angle drilling/pecking/tapping. See in tip of day video @ about 9:40

Setting up a Right-Angle Head on Your Haas; G17, G18, G19 Explained – Haas Automation Tip of the Day - YouTube