I am glad the company kept their word and that they are trying to do right by you. Everything they are doing seems like the right thing. It sucks you still feel stuck in your career -- do you think you will be able to treat the project and the workplace like a marathon and not a sprint? Tackling that may send a really strong signal to the AVP... and also just be good for your own peace of mind. Finding a life outside of work is really important.