BT HH5A bridge modem + router: move BT > Sky...?

Folks,
1/ I’m in the UK
2/ I’ve been using BT happily for about 4-5 years & now swapping to Sky/ Now (cheaper)
3/ My set up is OpenWRT/ BT HH5A as a bridge ‘modem’ with router (OpenWRT) behind it
4/ I’ve taken the modem set-up from the most excellent guide on the HH5A by @bill888’s, and:

https://openwrt.org/docs/guide-user/network/wan/isp-configurations#:~:text=Sky%20and%20NOW%20Broadband%20use%20DHCP

All the above assumes one device and so I’m interpreting the above across two devices, which is why I thought to post a wee query.

bridge /etc/config/network
config interface 'loopback'
option device 'lo'
option proto 'static'
option ipaddr '127.0.0.1'
option netmask '255.0.0.0'

config dsl 'dsl'
option xfer_mode 'ptm'
option annex 'b'
option tone 'a'
option line_mode 'vdsl'
option ds_snr_offset '0'

config interface 'lan'
option proto 'static'
option ipaddr '192.168.0.1'
option netmask '255.255.255.0'
option device 'br-lan'
list dns '192.168.0.10'
option gateway '192.168.0.10'
option ip6ifaceid '::1'
list ip6addr '2a00:23c6:c8fe:7d05::1/128'
list ip6addr 'fdd3:7f3d:919e:5::1/128'
option ip6gw 'fdd3:7f3d:919e:5::10'

config device 'lan_dev'
option name 'eth0.1'
option macaddr '02:xx:xx:xx:xx:xx'

config interface 'wan'
option proto 'none'
option delegate '0'
option device 'br-wan'

config device 'wan_dev'
option name 'dsl0'
option macaddr '02:yy:yy:yy:yy:yy'

config switch
option name 'switch0'
option reset '1'
option enable_vlan '1'

config switch_vlan
option device 'switch0'
option vlan '1'
option vid '1'
option ports '0 1 2 4 6t'

config switch_vlan
option device 'switch0'
option vlan '2'
option ports '5 6t'
option vid '2'

config device
option name 'br-lan'
option type 'bridge'
list ports 'eth0.1'

config device
option name 'br-wan'
option type 'bridge'
list ports 'eth0.2'
list ports 'dsl0.101'
router /etc/config/network
config interface 'loopback'
option device 'lo'
option proto 'static'
option ipaddr '127.0.0.1'
option netmask '255.0.0.0'

config globals 'globals'
option ula_prefix 'fdc5:4e49:f07f::/48'
option packet_steering '1'

config device
option name 'br-lan'
option type 'bridge'
list ports 'lan1'
list ports 'lan2'
list ports 'lan3'
list ports 'lan4'
list ports 'lan5'
option macaddr '...:a8:7d:ea'

config device
option name 'lan1'
option macaddr '...:a8:7d:ea'

config device
option name 'lan2'
option macaddr '...:a8:7d:ea'

config device
option name 'lan3'
option macaddr '...:a8:7d:ea'

config device
option name 'lan4'
option macaddr '...:a8:7d:ea'

config device
option name 'lan5'
option macaddr '...:a8:7d:ea'

config interface 'lan'
option device 'br-lan'
option proto 'static'
option ip6assign '64'
option defaultroute '0'
option delegate '0'
option ip6hint '5'
option ip6ifaceid '::10'
list ipaddr '192.168.0.10/24'
list dns '1.1.1.1'
list dns '1.0.0.1'
list dns '2606:4700:4700::1111'
list dns '2606:4700:4700::1001'

config device
option name 'eth1'
option macaddr '...:a8:7d:e8'

config interface 'wan'
option device 'eth1'
option proto 'pppoe'
option username 'bthomehub@btbroadband.com'
option password 'BT'
option ipv6 '1'
option metric '10'
option peerdns '0'
list dns '1.1.1.1'
list dns '1.0.0.1'

config interface 'wan6'
option device '
'
option proto 'dhcpv6'
option reqaddress 'try'
option reqprefix '56'
option norelease '1'
option disabled '0'
option metric '10'

config interface 'guest'
option force_link '1'
option proto 'static'
option ipaddr '192.168.9.1'
option netmask '255.255.255.0'
option ip6assign '64'
option multicast_querier '1'
option igmp_snooping '0'
option isolate '0'
option bridge_empty '1'
option disabled '1'
option device 'br-guest'
option ip6prefix 'fdc5:4e49:f07f::/48'
option ip6hint '0001'
option ip6ifaceid '::1'
option ip6class 'guest'

config device
option name 'br-guest'
option type 'bridge'

config rule 'policy_relay_lo_rt_lan'
option lookup '16800'
option in 'loopback'
option priority '1'

config interface 'tethering6'
option device '
'
option proto 'dhcpv6'
option disabled '0'
option metric '30'

config interface 'wwan6'
option device '@wwan'
option proto 'dhcpv6'
option disabled '0'

config interface 'wwan'
option proto 'dhcp'
option classlessroute '0'
option metric '20'

config interface 'secondwan'
option ipv6 '0'
option proto 'dhcp'
option metric '15'
option force_link '0'
option classlessroute '0'

config interface 'secondwan6'
option proto 'dhcpv6'
option device '@secondwan'
option disabled '1'
option reqaddress 'try'
option reqprefix 'auto'
option norelease '1'

config rule 'novpn_to_main'
option gl_vpn_rules '1'
option mark '0x8000/0xf000'
option priority '6000'
option lookup 'main'
option disabled '0'

config rule 'vpn_to_main'
option gl_vpn_rules '1'
option mark '0x0/0xf000'
option priority '9000'
option lookup 'main'
option invert '1'
option disabled '0'

config rule 'vpn_leak_block'
option gl_vpn_rules '1'
option mark '0x0/0xf000'
option priority '9910'
option action 'blackhole'
option invert '1'
option disabled '0'

config rule 'vpn_block_lan_leak'
option gl_vpn_rules '1'
option in 'lan'
option priority '9920'
option action 'blackhole'
option disabled '0'

config rule 'vpn_block_guest_leak'
option gl_vpn_rules '1'
option in 'guest'
option priority '9920'
option action 'blackhole'
option disabled '0'

config rule 'vpn_block_wgserver_leak'
option gl_vpn_rules '1'
option in 'wgserver'
option priority '9920'
option action 'blackhole'
option disabled '0'

config rule 'vpn_block_ovpnserver_leak'
option gl_vpn_rules '1'
option in 'ovpnserver'
option priority '9920'
option action 'blackhole'
option disabled '0'

config rule6 'novpn_to_main_6'
option gl_vpn_rules '1'
option mark '0x8000/0xf000'
option priority '6000'
option lookup 'main'
option disabled '0'

config rule6 'vpn_to_main_6'
option gl_vpn_rules '1'
option mark '0x0/0xf000'
option priority '9000'
option lookup 'main'
option invert '1'
option disabled '0'

config rule6 'vpn_leak_block_6'
option gl_vpn_rules '1'
option mark '0x0/0xf000'
option priority '9910'
option action 'blackhole'
option invert '1'
option disabled '0'

config rule6 'vpn_block_lan_leak_6'
option gl_vpn_rules '1'
option in 'lan'
option priority '9920'
option action 'blackhole'
option disabled '0'

config rule6 'vpn_block_guest_leak_6'
option gl_vpn_rules '1'
option in 'guest'
option priority '9920'
option action 'blackhole'
option disabled '0'

config rule6 'vpn_block_wgserver_leak_6'
option gl_vpn_rules '1'
option in 'wgserver'
option priority '9920'
option action 'blackhole'
option disabled '0'

config rule6 'vpn_block_ovpnserver_leak_6'
option gl_vpn_rules '1'
option in 'ovpnserver'
option priority '9920'
option action 'blackhole'
option disabled '0'

config rule 'main_static_net'
option gl_vpn_rules '1'
option suppress_prefixlength '0'
option priority '800'
option lookup '9910'
option disabled '0'

config rule6 'main_static_net_6'
option gl_vpn_rules '1'
option suppress_prefixlength '0'
option priority '800'
option lookup '9910'
option disabled '0'

config interface 'tethering'
option proto 'dhcp'
option metric '30'
option device 'usb0'
option disabled '1'

From the above I figure bridge /etc/config/network should be okay - perhaps the option ds_snr_offset '0' and option macaddr '02:yy:yy:yy:yy:yy' should be removed?

But, router /etc/config/network should - perhaps - be changed so:

config interface 'wan'
option device 'eth1'
option proto 'dhcp'
option clientid '77616E4D414364647265737340736B7964736C7C7769666970776F7264414243444546' # optional, being hex of wanMACddress@skydsl|wifipwordABCDEF
option macaddr 'wanMACddress' # optional
option ipv6 '1'
option metric '10'
option peerdns '0'
list dns '1.1.1.1'
list dns '1.0.0.1'

config interface 'wan6'
option device '@wan'
option proto 'dhcpv6'
option reqaddress 'try'
option reqprefix '56'
option norelease '1'
option disabled '0'
option metric '10'

I’m left unsure where option ifname 'dsl0.101' should go, if anywhere - there’s already list ports 'dsl0.101' in the bridge and it doesn’t seem to make sense in the router.

Any tips of best set up are welcome!