After receiving the hammer drill I ended up getting the impact AND a Surge. Now I won't be kicking myself on all these projects I was using air on renovating our condo.
There is a time and place for frugality. Upgrading to M18 tools isn't one of them.