i will give you that; the disturbing lack of recovery mode on the C2 is easier to leave in place than to remove, but who would still want to buy it?
my proposal requires development, but very little. you can already use a 5-digit pin without using FDE in SFOS, and you can already set the FDE key to something long in SFOS. just do both of those things at once and you’re done…