Confirmed bad motor mount. I had ordered one (link in my previous post) it arrived yesterday. Brought to my mechanic who had it installed today (2 hours labor charge, worth it in my opinion).
Here is a pic of the new mount (took this morning):
Here is the old one (after it was removed):
Could definitely tell the difference after - no clunk and shifting was improved. Will see how things go after I get a chance to drive it a little more.