Ok so I readded my changes but they actually work this time.  The collisions aren't quite right yet, but they weren't totally perfect before either.
Now, Player and Obstacle X and Y are in scene space, so a Player's Y is just 0 when he's at the bottom.
Technically this means that the focal point for obstacles and player are the bottom left corner now rather than the right.