I'll have to play around with those upgrades. The 2x should stack with the additional points, and in my (admittedly limited) testing it did, but it's possible there's somewhere where it can get messed up or even not trigger at all. Sounds to me like it could be a bug you encountered, so I'll definitely look into it!