I think that there are some steps you can take to get him a bit less of a boobaholic.
Has he got the hang of cups and sippy cups?? Can you give him milk in them sometimes? And then boob afterwards - so he's not automatically associating being thirsty with having boobs?

And it sounds like you need him to learn to resettle or settle without boobs. Night weaning aint fun, but it can be done. You could try either having boobs go to sleep at a certain time and then offering cuddles and water (and maybe even food) and riding out the few days of really angry grumping-until-exhausted that will probably happen until he gets there. Or you could try cutting his night feeds short so that he is still awake at the end of them, and then slowly cutting them shorter.
Getting Daddy-cuddles rather than Mummy-boobs isn't exactly what bub wants, but nor is it deserting bub.
good luck and hugs
Kate