Secure 2.0 Limit Management for Separate Catchup Plans with User Defined Limits

We would like to know if anyone has come up with a solution to manage the requirements of the Secure 2.0 "Super Catchup" contributions when you have a separate catchup election that uses User Defined Limits? The delivered update to the limit table functionality only applies to the 402(g), 403(b), and 415 limits it does not apply to User Defined limits so we are trying to figure out how we can manage the different limits based on age.