Actually, I just made up the second technique while writing and have to test it myself yet, but at least I think that could work, but I will try it today or tomorrow and give you some feedback.
Can I ask how you did implement the actual physics recalculation?