This is the exact situation I'm in and I'm on my 3rd TN. Get a good lawyer and this shouldn't be a problem.
If you do get this visa though, be very careful what you say to the border guards. You need to ensure that when speaking about your work, you always frame it as "work in support of scientific research/innovation".
It is a little less straightforward then the Computer Systems Analyst category but it can be done.