Maybe I'm missing something, but wouldn't it make sense to have two separate server instances in their own directories? I do this with my client installation (also keeps me from accidentally corrupting worlds with wrong mods) and it works out great.
That, and with a simple enough batch file, I can choose which server I want to start up. Accommodates CraftBukkit too, since it already requires a bat script to load.