Substitutes for "masters swim"

From the tri book I've been slowwwly reading: these might be a good substitutes for the masters workout, since we don't have masters groups at any of our local pools:

Long interval workout: 3450 yards total
WU:
100 drill, 100 kick, 100 drill, 100 kick ("drill" is something like single-arm, catch-up, etc.)
MS:
6x400 at T-pace (i.e. 1km time-trial pace) with 40 seconds RI between. Try to negative-split the second 200 with more perceived effort
CD:
100 drill, 50 kick ez
500 swim with good form

Medium interval workout: 2350 yards total
WU:
3x100 descending times
4x50 kick descending times
MS:
6x200 fast with 50 kick ez recovery between 200s
200 kick steady
CD:
200 ez swim

The purpose of the "masters swim" in our schedule is the same as the interval runs-- it's for speed. The problem with doing long open water swims is that you don't really get good speedwork unless you're meticulous about tracking interval times and perceived efforts (since it's difficult to judge distances).