We'll enhance this for the next release.
Note that you might be able to prevent problem #1 by using different PL/SQL Developer shortcuts for different projects/databases. For each shortcut you can use the workset parameter to open a specific workset. For example:
"C:\Program Files\PLSQL Developer\plsqldev.exe" workset="Project ABC"