I wouldn't be at all surprised if the tra la la lally song is omitted, although there is some potential in the elves' treatment of the dwarves for a bit of PJ's sense of humour to be developed.
Given the importance of Rivendell in the first movie, would it do to rush too quickly by it in TH movie?