If it were I, I'd ride the 630....it has the legs for cruising and the ooomph of over 600cc's..........you could always test a CRF and see if it can sit at plus 115kph with all of your kit ......bear in mind especially when it comes to long stretched-out mountain autoroute climbs, of which we'll hit in Spain....these can slow you down if you don't have the ooomph.
Last years CRF's were topping out at about 90kph albeit on changed lowered gearing before any off road. Dead slow on any autoroute climbs. One was considerably heavier than the other due to kit. Hard on the engines to keep them singing along.
.