The $30 seems like it might be a better bet. No SAF on new plans, so taking that in to account, then you would actually be paying less for the base plan (assuming $7 SAF currently). If you currently receive a paper bill then you will start paying $2/month for that when you switch.
Unlocked Pentaband iPhone 5 (AWS), unlocked iPhone 4
Unlimited airtime, Unlimited CAN/US long distance, Unlimited SMS to CAN/US wireless numbers
2500 Call Forwarding minutes to CAN/US numbers
Google Voice for visual voice mail with message transcription, conditional greetings, unlimited messages (vs 35 message cap), remote retrieval from any PC or phone, no auto-purge after 10 days and most importantly no $7-$8 charge.