The Sunderland and Catalina would be the wrong choices, IMO.
The H8K2 "Emily" was the most advanced flying boat of the war, and for quite a few years after. It was better armed, faster, tougher (possibly the toughest WWII aircraft of all), climbed faster and flew further. It was simply better.
It would also give the Japanese a somewhat usable bomber in the CT.