Well and update, I have been able to get it to ring through the phone and not the headset again.
How did I do it you ask, I have no idea. Yesterday the phones battery died on me again and when I charged the phone up and turned it on this morning the first call went through my phone and not the headset. Funny thing is, this is how it first stopped working, b/c the battery went dead...
I would really like to know how this is done now, for future situations.