I kinda stumbled upon this thread, but I'm glad I did.
I saw you mention that you were considering a Christmas Wrasse. I can tell you right now that you really really should not consider them for your new tank. I've got one in my 120 SPS tank, and while he isn't aggressive at all, he does eat my snails. He eats anything but astrea snails, and even my 1 big mexican turbo snail doesn't come out during the daytime anymore because he gets picked at by the wrasse.
You said you don't want a sixline, but I've got one and really love it, though I've gotten the impression that their personalities are really hit or miss, getting an overly aggressive one or a passive one.
Anyway, it sounds like you're going to have one sweet new setup, so I wish you luck!