Goal is definitely gigabit. I've ordered a few of those connectors that @RunningMan recommended. Sadly looks like they'll ship on the 29th.
For now - I'm going to take some interim steps to reduce the number of joins required - I think I can potentially reduce the number of joins by 2... simply by changing the scope of the cable from:
Comms cupboard -> downstairs bedroom -> downstairs living room (currently empty) -> ETP -> Kitchen -> upstairs bedroom -> upstairs comms room
5x joins
To:
Comms cupboard -> Existing cat5e to downstairs bedroom with switch -> downstairs living room (currently empty) join -> ETP join -> Kitchen join -> upstairs bedroom switch -> upstairs comms room via existing cat5e cable.
3x joins
WAF becomes a fairly significant factor - I can get away with using switches in the bedrooms but I won't be very popular if network equipment starts popping up in the kitchen ;)