Speaking of Naval Jelly and things automotive, they do sell a rust converter
that is supposed to tranform rust into a blend of "magnetite, and other inert
substances..." You can shape and paint over the resulting black mess where
your rust was/is.  Just do a web search.

Dunno if this has been mentioned or helps,
Mike Sewell