If the wing is not working, then it doesn't matter what size it is. If it is working, then 25# seems likely to be plenty of lift.
With an empty (or dead) wing, you're talking about 5# of BP and 7# of tank/gas. So, you're 12# negative? But then if you have a full 3mm wetsuit, maybe only 8 - 10# negative?
At that, most people could swim that up to the surface without any real trouble. Especially from only 30'.
If the wing is totally dead and you get to the surface, and you aren't able to swim to shore or otherwise keep your head above water, your ditchable weight is your whole rig.
A good, 6' SMB can be around 30 - 35# of lift. If your wing is totally dead and you don't want to ditch your rig, that could be made to work to keep you afloat.
Again, if the wing is dead, it doesn't matter what size it is. If the wing is fine, then 25# is probably plenty. I've done numerous dives in 3mm, SS BP, HP120, and HOG 23# wing. Mostly, 10 - 30 miles offshore, diving to 80 - 120 feet, off North Carolina. That 23# wing has never let me down.

LOL