Solar panels don't have good enough power to weight ratios and aren't likely to contribute effectively.

As far as sails go, you need a second medium to act as a keel, otherwise it's impossible to get a net push in any direction other than downwind.