It definitely needs fine tuning on both your points. I did come up with a solution, but after the deadline.
