Sounds like your on the right track, I would also add a sump pump in the floor. All the waterproofing in the world won’t help if the water table is higher than the floor.
Basically fuck basements, they all leak sooner or later. We have had issues when we get a big melt. I waterproofed and added drainage. I really need to add a sump in one corner to pump down to the base of the footings.