For me, the extra five days with HAL makes it a no brainer. However, since I’ve been on both ships, I do prefer Diamond Princess over Westerdam, but a Neptune suite gives you access to the Neptune lounge, which is a huge plus.
I'm sure you would enjoy either one, but if I’m going all the way to Japan, I want the most number of days as possible.