In alot of ways, the best solution is the -AN bulkhead fitting route that you refer to. Looks like we (meaning RTM) are going to go with a competely re-designed sending unit. It's already in the design phase, but it won't be ready for this season, that's for sure.

Anyway, none of these solutions (bulkhead fitting, new sending unit, etc) can fix broken studs. There are ways around it if you happen to break some, but it's best not to break any.