Came back to this when there was free time. Made a quick fix on the collisions - those work alright. Next up - make collisions happen gracefully.