For now, stay with 2.3.3 and lobby them like heck to keep posting at least critical security fixes for it.
The "upgrade" of admin functionality in 2.5.x is mostly a step backwards, especially for power users.
The only thing that was wrong with the 2.3.3 widget screen was the layout of the drop-zones, which I promptly changed (in the wp-admin/widgets.php file and some admin CSS).
Check out the result here: http://businessmindhacks.com/p/widget_mgmt_screen.gif
BTW, putting your custom code into the text widgets was never that good of an idea from an editability/manageability standpoint. The little edit popup for the text widgets was always a pain and liable to cause you lost code, etc. and the naming would get confusing since all they would show is "Text[x]".
Best to put them into your theme's functions.php and control them from there. Then just drap-drop on the widgets mgmgt screen. Oh right, I forgot, it's not that easy in 2.5.x anymore...
That way you can also have multiples of the same widget if you have separate sidebars for index/posts/pages/etc.
Example code:
function widget_whas_dofollow() {
?><div class="whas_widget"><h2>DoFollow Community / BumpZee</h2>
<p style="text-align:center;"><a rel="nofollow" target="_blank"
href="http://www.bumpzee.com/no-nofollow/"><img src="/i/nonofollow.gif" />
<img src="/i/ifollowblue.gif" /></a>
</div>
<div class="endofwidget"></div><?php
}
if ( function_exists('register_sidebar_widget') ) {
register_sidebar_widget(__('whas-dofollow-1'), 'widget_whas_dofollow');
register_sidebar_widget(__('whas-dofollow-2'), 'widget_whas_dofollow');
}