TL:DR: Would coverting an old 5" quad from 3s (HiTec 2204 2300kv) to 6s (Axis flying 2207 1860KV) be in the same ballpark?

I aquired an old 5" quad from a lot of drone stuff. I gutted it and installed a speedybee f405 v4 55amp stack. I also added gps, upgraded the vtx/tx/rx, and mounted an old runcam2 with a rudimentary gimble.

Inevitably, I burned one of the motors when I decided to go spaceX. I let it freefall then went 100% throttle right before it hit the ground. It was impressive and it did not go splat, but I burned up a bearing in one of the motors.

So now that I'm swapping motors, I've read that 6s is the way to go. My FC can handle 6s 55A. I liked how it performed with the 3s, so I can only imagine what 6s will feel like. 

My question is: would the 6s Axis flying 2207 1860KV motor be similar to the old 3s HiTec 2204 2300kv? If not, what motors would you recommend? Also, would you use the same mah battery for the 6s as the 3s (2000mah was the old 3s lipo)?

I know that a 6s 1150kv would be the equivalent to a 3s 2300kv as far as rpms per volt go. But that seems low. The lowest that seems reasonable is 1700kv at 6s.

This thing is a clunker, Frankenstein, tank that I built. My goal is to be an ATV of sorts as I learn. Little freestyle, little record some shots, heavy and sturdy, not very pretty. Here are the specs. Any help/insight/jokes would be greatly appreciated. Thank you!

5" dinosaur frame, but solid as hell.

Old specs: 
Proprietary FC/RX/ESC all in one.
Cheap vtx 5.8ghz
5x4 bi-prop (changed to 5 x 3.7 x 3 Tri-Blade)
3s 2000mah lipo

New specs:
Speedybee f405 v4 55A stack
Gps
5.8ghz 600mA vtx
Rx/Tx (looking to upgrade to elrs)
5x3.7x3 Tri-Blade Props

Axis flying 2207 1860KV motor?
6s 2000mah lipo?

It weighs 639g w/ the old motors, upgrades, and no battery.





Question on motor selection. Converting a 5" quad from 3s to 6s.