Hi,
If everything is running as you say, what is the limitation you're trying to address with this upgrade? Or is it just to give you a new challenge? If the 2nd, the RPi is as good a place as any to start. If you've got something specific to fix that might help narrow the choice.
Geoff