Oh boy does that sound familiar to me. MrBond is giving you good advice, try to prepare yourself for the inevitable temper tantrum because it will happen if he doesn't get his way, hopefully less and less. I am dealing with this currently. It is very unfortunate and not at all what I expected to be dealing with at our ages/stage of life.
Just try to keep in mind that as you make your way to healthier boundaries, the tantrums should be less or they simply won't bother you any longer.
