Okay here's what I would add/take out:
Level 2: mirror image (out), resist fear (in)
Level 3: skull trap (out), fireball (in); if you're not soloing then put haste in for web
Level 6: death spell, summon nishruu (out), true sight (you must have this one!), improved haste (if you're not soloing)
Level 7: finger of death (out), mordenkenain's sword (in)
Level 9: wish (out), power word kill (in)
------------------
Goddess and Sorceress of the HADB, and her sidekick Pink