Well done!

As far as having a 6 bolt in a 2G, you can still search for parts in the 2G section of RTM. They accommodate that combination in their listings.

Otherwise, you'll have to use your discretion; there are a few ways to do the swap. If you have not already read Magnus' 1G in a 2G article, I recommend it. It includes a breakdown of the parts used in different versions of the swap, among other useful information.