I'm torn between Martha or Himiko for my second choice. Definitely enthusiastic ones, but you'd have to be careful they wouldn't break your back. Martha being more normal, Himiko can cycle between normal and full on tackle.
But then, my ultimate choice? Quetz. Definitely gonna get into wrestling holds after the hug 99% of the time, but the 1% is some good (if crushing) hugs.