Easy.

After u do a local Chat Backup, copy the entire WhatsApp folder from the old phone to the new phone and set up all over again. WhatsApp will detect the latest backup and proceed to restore it.

Been doing it this way for all my phone since Day 1. Everything will be restored completely except for those messages that arrived during the backup process.