So I need to create one version for the normal game and one to work with the naughty mod...
...Bugger.
I had hoped not to have to do that.
It's even worse than that
You'll have to make sure that naughty mod loads first (=is higher in the mod list than your mod).
And remember, that many people will have naughty mod turned off... so if you don't include full definitions (or make this part of your mod optional as well), it will fail too.
If I were you, I'd just ignore all things from naughty mod; resp. everything not in the base game.