Overall I feel that our Prime Minister acquitted himself well. He was respectful, and at the same time stated that we have fundamentally different views in some areas. He also acknowledged that you don't go to someone else's house and criticize how they do things. The unspoken message is that once back home, that could change if the behaviour is egregious. But as Trudeau also stated, we have a long-standing and unique partnership that is too valuable to just throw away.
In terms of the handshake thing, it pretty much went as I predicted. Trudeau boxes, so I wasn't surprised to seem him maintain balance, poise, and not give an inch. Politically, he did not want to seem "weak" and succeeded through an effortless (looking) tug of war. At the same time, he was smiling and cheerful and the gift he brought Trump was a photo of Pierre Elliott Trudeau (Justin's father) with Trump in 1981, acknowledging tacitly that Trump was a "big man" back then, big enough for the Prime Minister to meet at the time.
And whoever came up with the idea to do a Women's Entrepreneurship conference as a major event of the trip deserves an award. Trump gets to improve his image with women (slightly), Trudeau gets to make the point that he's an avowed feminist, and Ivanka is included which makes Trump happy. And in this case, it's appropriate to include her because whatever else you may think about her, you cannot deny that Ivanka is a female entrepreneur.