I vote for the poodle!
I have a poodle story for you... First, let me set this up...
The night that I got my poodle puppy a tornado hit our house, which is why we all decided to name her "Windy".
Windy is black toy poodle, and she was 2 years old when we got our yorkie, Ted. Windy loved Ted from the start.
My dad died and my mom was lonely, funny thing is that it seemed as if Windy could somehow sense that Mom needed her. Since my mom had already bonded with Windy and it was very mutual, she asked if she could take Windy home with her for a few weeks, for the company. After a few weeks we went for a visit, and to get Windy (Mom lives 3 hrs away). Mom cried over the thought of Windy leaving. So that's when DH, the kids, and I all decided that letting Mom keep Windy would be for the best. Also, Windy keeps my mom more active because she LOVES to go for walks, and of course, Mom LOVES to indulge her!
I miss her, but I know where she is, and they are both so happy together, plus they come to visit very frequently, usually for a week at a time. Windy loves all 3 of our yorkies, and they all have a blast playing with her. I must say without hesitation that Windy is one of the smartest dogs I've ever seen or had. Also, poodles have a very sweet disposition, cute personalities, and even better, they are incredibly easy to house train! If you keep her cut short, her coat will be very easy to maintain.
Good luck making your decision, and let us know what you decide!!!