Keep pushing for terms that would make you happiest. You have a very good chance of realizing them.