Naho will become consort-able once she's undergone some other character development, and we've written it all. Marie-Anne can be brought back, you just need to visit her in Act III when you have a lair to bring her back to.
