You really need to detach yourself emotionally from work. You need act less with emotions and more rationality. When people promise something x in the future,

You really need to detach yourself emotionally from work. You need act less with emotions and more rationality. When people promise something x in the future, without any official contract I automatically assume that its not going to arrive. It's just carrot. Expect the worst, and be a bit stoic. In many ways less gain now, is better than larger potential gain later because of the risk you take. Don't try to forcefully negotiate, or use ultimatums without any BATNA. When he broke his promise, don't say anything. Find another offer, come back and say I have offer x now, bye. Maybe he will give a counter-offer if he really cared. I've learned this from experience.