EmmyJo - your little boy has a very typical feeding pattern for a baby of his age. Feeding solely for comfort is a good thing - why wouldn't a little baby want to make the most of your snuggly, loving arms and the closeness he gets from feeding? Responding to him teaches him that he is loved and cared for, that his needs will be met, and research shows this style of response means babies are less likely to be whingy and whiney at 8 mths or so (if your partner needs chapter and verse on this, I can give you academic references!). They are less whiney as they have confidence in the world and can self-soothe and wait a little for attention
Are you sure you still need to spend hours winding and massaging? Would feeding and/or holding not do the trick? I understand about the massive vomitting, which is a nuisance, but is it more or less of a hassle than just giving him what he seems to want?
January - when you go to work - is ages away.
Top ups of formula risk
i) undermining your milk supply
ii) undermining you - as you are happy to be excl bf!
iii) being a hassle in themselves (buying the milk, preparing it, washing bottles and teats, giving the top up)
iv) affecting his reflux
Spacing out feeds makes him distressed - so why do it? I expect there are times when your partner wants a cuddle only an hour after he had the last one, or two cups of coffee or beers less than 2 hours apart...so what? We are all human, not robots
Good luck with this. Feeling confident it will not always be this way will help you, and him, I think.