Welcome to the board

IMHO if I were you, I would only do mods to the engine that would carry over if you were to do a swap. Also IMO I would keep the Sol you just bought and do a swap, ect... I would not be confident of getting $4000 for it in 2-3 years. Instead, maintain the one you do have and build from there.