Aaron, did you ever get it working??
I am in a "somewhat" similar boat... I didn't do anything to my baseband, at least not that i know of, but my 3GS is stuck in restore... I've tried quite a few things already... see my thread here...
https://forums.macrumors.com/showthread.php?p=12887935
and here...
http://xsellize.com/topic/147043-3gs-stuck-in-recovery/
I am in a "somewhat" similar boat... I didn't do anything to my baseband, at least not that i know of, but my 3GS is stuck in restore... I've tried quite a few things already... see my thread here...
https://forums.macrumors.com/showthread.php?p=12887935
and here...
http://xsellize.com/topic/147043-3gs-stuck-in-recovery/