Sounds like you spent alot of time on the front brakes, how about the rear brakes. In y 98 c&c if the rears ar out of adjustment, the pedal feels spongy. This seems to be the issue with ay of my one tons, gas or diesel.
So if it was me I would adjust the rears till they just start to drag the rum when jacked up.
I think that may help.
Dino