Tough trying to make decisions without being able to hear what they may sound like and therefore able to weigh up the cost vs benefit vs effort involved.
I reckon your simplified plan will work out fine and you can always revisit things later on if you become tempted to explore what more those PUP's might have to offer.