Found a faster solution pretty much based off your setup.
wow my solution was almost same. But you can try this it was neat
