Hana clone upgrade questions

[possiblevaper]

i have on its way to me a fasttech hana dna20 its a full sized hana but with built in 1600mah lipo.

now i have no intentions of using it as it, i have a vaporshark thats 30 watts so a dna20 clone is no use to me, also i dont trust it, so i plan on changing all the internals.

i want an evolve dna30 board in there with a removable 18650
as its a full size hana with lipo im hoping it fits
here a picture of the internals he sent me

I have no experience in electronics or mod making what so ever.
i have found the spec sheet for the dna30 and had a scan through it

but by my reckoning i need:
a dna30 (stealthvape) sorted
20 gauge wire
24 gauge wire
a single 18650 battery holder

i already have a soldering iron from modding my old xbox lol

i'm replacing all the wire and starting from scratch as i dont know what gauge they used and again i dont trust it.
basically the only things i'm keeping are the actual box the 510 and the buttons.

is there anything i'm missing?
and does anyone know where i can find these things (all in one place preferably)