Yo tarrel, nice place you have there, looks nice and peacefull, we stayed at a house in Elgin a couple of years back, really enjoyed exploring the area, and single malts

Anyway the heating system, how about a WBS with boiler in the lounge feeding a thermal store in one of the bedrooms, this could be connected direct and would run fine on a gravity system, thus safe in the event of power cuts etc, you could also fit a bleed radiator for one or more of the upstairs bedrooms if you wish. Within the thermal store would be 2 coil heat exchangers, one for the input of the solar panels, one an output for the heating system which remains pressurised as existing, so in effect you have 2 heat sources for your heating. The advantage of this is that when you are not able to burn the WBS for whatever reason the oil combi does not have to heat the store before you get heat to the house or the hot water. In fact the Oiler never heats the store.
The hot water could either be provided by a third coil in the store which preheats the water on its way to the oiler, or you could bite the bullet and convert the oiler to a system boiler, install a new hot water cylinder and feed that from both the solar and/or the store/oiler. This would end up being very similar to our system here at cactusville, but with one big advantage, your thermal store would be within the heated envelope of the house, so during the heating season any losses from it would usefully heat the bedroom. The thermal store could also act as a heatdump in the summer for the solar, with the slight chance that you could recover some of the previously dumped heat.
Personally I wouldn't bother with both a batch boiler and a wood stove in a property of your size, after more than 2 years we find the stove and the solar supply over 80% of our heating and hotwater, and the gasser just sits there sulking, but very handy when you have a stinking cold to be able to press the button and warm the place up.
Whaddya reckon, this is just my take on what may work for you, some will disagree some wont, others will be along with more ideas, but for now................
Cheers
Desp