iPhone Firmware Stuck

Ok so I got my iPhone replaced today and the replacement I got came with 4.0.2 (Modem firmware 01.59.00 ) on it. So I went to update to 4.1 and i got the 1013 error and it was stuck in recovery mode. So I used recboot to kick it out and I noticed that the modem firmware never updated. So I proceeded to update to 4.2 GM (Im registered) and I got the same error 1013 but this time it wouldnt kick out of recovery mode. Im also getting the 1004 error... I have no clue what is going on..How do you force it to update... I have restored with 4.1 several times and the modem firmware is still on 01.59.00
MacBook Pro i5 Mac OS X (10.6.4) iPhone 4 iPod Nano Macbook Pro i5 Time Capsule Snow Leopard