I'm also working on a 2D game. I end up with hundreds of objects so maybe this solution will make more sense in my case. I have to run benchmarks...

I like the approach of finite-size objects since I'm mostly working with creatures that collide or not based on their radius. I also have some polygons, but I can easily simplify them into circles (https://en.wikipedia.org/wiki/Smallest-circle_problem).