So just to conclude this, I finally made a decision. Went with the DHP490 drill and DTD153 impact, both a decent upgrade from the base models. Plus the 186 recip saw.
Only added a single 3Ah battery, because once my tools are all reunited I'll have plenty of batteries.
Powertoolmate won out in overall cost, there were only a few quid in it. If I'd wanted to, I could have split the order between two or three different places to get the absolute lowest prices, but I'd have lost out any savings in additional delivery charges.
Looking forward to my new toys