None taken Chris! My suggestion came from the most suggested reply when I asked on the cycling+ site about lubes. Seems ok to me but I haven't used many.

Batfink...probly a good idea to go back like he suggested when you have time and attire to test ride. Like you say I don't know how much a set-up service will be worth it if you're not going to be doing too many miles, it is useful to get it setup nicely for you but you'll be able to adjust it once you've ridden it a bit, if you can afford it its money well spent. Otherwise spend the £35 on those shorts.

Orbea are nice bikes I think but like you say the carbon fork probly won't make much difference. Best way is to test ride and see if it feels £100 better than the Giant. But bear in mind you'll still have to buy all that stuff after the bike which mounts up. Might be better off spending the extra 100 quid on kit.

Anyway, just test ride them and I'm sure the descision will be clear. You'll be able to do more than 20 miles in 2 hours on your bike!