my thoughts are that you shouldn't be greedy, you've got the job offer, its a substantial improvement so get on with taking it and justifying a big pay rise next year rather than worrying about where you are now because they may be saving too much money paying you a bit under your UNEXPECTED market rate..