I found that Maggie liked to cluster feed in the evening. I used to think it was a problem, then I found out it was normal, and part of the reason why she could sleep longer stretches at night (back then, not now though). It was a PITA to be tied to the couch at nights, but it really lasts a short time. Go with the flow, it makes it easier to deal with, remember your stress can make bubs worse.

As for other suggestions to help, have you tried a massage after the bath with calming music? What about using a sling (eg HAB) What about a shower instead of a bath, it is relaxing for both of you and the room gets nice and warm, so it is not so jolting on bubs to be taken out of the water.