With my last UD experience being on G-BNLK which was falling apart at the seams, I would go with the 787 which on my last two sectors (Toronto being one) was absolutely perfect in Clubworld.

I was on G-CIVT last month in UD also which was, whilst not as bad, also in need of a refurb.

For me, I feel like I am getting a vastly upgraded experience on the 787 in look and feel.