I tried to update the thread, but it was on the second page anyway, so here's a new one...
This afternoon I got the job offer and had to negotiate, and I did it and got what I asked for! I cannot wait to quit on Monday! (Did I make that clear enough? Ha). Thank you all for the awesome advice - it worked! <)