I have the same radio situation. What did you end up doing? What parts did you buy? Thanks in advance