I'd still put my money on oversupply. What you described- feeling full and uncomfortably swollen on a very frequent basis- sounds like some pretty significant oversupply! Of course, there's no harm in doing dietary eliminations, but I hate to see moms drive themselves crazy and subsist on nothing but rice and pears... If they don't need to. ;)
I've been scanning the packages of food. before making a purchase as to void off any potential milk intake.
But it's almost been two weeks now and I see that it an be up to six weeks time for it to completely clear out of our systems.