CS Degree + SE specialization applying as an Engineer

I'll be graduating in 2027 with a Bachelors of Computer Science from a Canadian university. I've interned in the US with plans on returning full time on a TN visa. My current understanding is that applying under the "Engineer" category without an engineering degree has always been a gray area, but since the June memo it's an increasingly risky option. The other option is applying as a "Computer Systems Analyst", though the risk is that the applicant has to show that programming isn't a major component of the job.

I have the option to add a "Software Engineering specialization" to my degree by changing my course plans and was just looking for some advice. Would it help my case for applying as an Engineer? It seems crazy to skip on courses I'm interested in on the off chance that it may help with my TN visa, but it also seems crazy to not do everything I can to maximize my chances. Would appreciate any thoughts and advice