Sounds like you did the right thing with the bath etc. Sometimes if they are playing up like that I think you just need to leave it for a while with the BF, even if they scream a bit (ignore me if you want!).
When you are bf it's easy to think that they are always crying from hunger, when it might be sth else entirely (but they rarely say no when offered the breast, so sometimes do the kind of thing you describe).
Maybe you could get out of the house for a walk when this kind of thing is going on. After a bit of a break (as today), LO will probably take a "proper" feed.
Nothing wrong with comfort feeding of course, but it can be very wearing, especially if it doesn't FEEL comforting to you.
With DS1, I basically fed on demand, but found it quite wearing initially, and used to look at the clock and see how long it was since last feed, and try something else other than bf if it had been less than 2 hrs.
Went on to BF for a year so it didn't do any harm (because tbh I would have given up otherwise.)
It does all settle down - good luck - hope you're not gritting your teeth for much longer