Mmm I think it sounds like the reflux is back sorry Hun
those two symptoms are cosmic reflux ones and usually indicate acid in the throat. I mean if you can smell the acid in the spill esp after a bf (where the spill shouldn't smell at all really) there is acid YK?
Remember reflux flares during teething so it may be he needs it during these spells. Plus it is cyclic. You don't always have bad days over and over, but more good and bad periods. I you have ranitidine left over I think it's worth diving him a few days on it to see if it helps. If it starts to YK it's the reflux.
Don't feel guilty nursing him to sleep.