My bet is you're right regarding the 21" 'toons. Most of the newer boats, especially those with forward play pens, are all on larger pontoons (23"-25"). Been a while since I had one of the older boats with 21" toons, but I do remember one big redeeming feature it had over the newer boats. They ride AWESOME in choppy water compared to the newer boats! Where the bigger toons are rattling/bouncing along on the water's surface on choppy days, the 21's ride a little deeper, with a noticeably better ride.
Just tossing an option to the rake plan - have you considered securing a big truck inner tube up under the front of the boat? Or a big block of foam? That would add all sorts of flotation if the front if the toons started to submarine, and act like a brake as well. You'd just have to figure out how to secure it, keeping it up out of the water in normal conditions. Maybe secure it with some netting?