Speaking of changing the first kit, I have decided to swith from the NC to the 1/350 Dragon Spruance. I have PE for it and it shouldn't take too long, realtively speaking, to complete.
It's actually a replacement for a kit I started 20 years ago but didn't have the skillset to complete.
And yes, it will have a water base.