Firebrick question

[David Mahon]

Some time ago, in anticipation of a change of ISP, I altered my network
to:

router - firebrick - LAN
x.x.x.1 - x.x.x.2 - x.x.x.X

rather than the traditional setup with different subnets on either side
of the firebrick. After a significant alteration in my useage, I am now
staying with AAISP.

I am now finding it very difficult to get back to the traditional setup
(my network breaks down and I have to reset the firebrick to manage to
talk to it). Unfortunately if I reset the firebrick, I loose all my
rules. If I reload a saved setup, I have to reload the routes/subnets as
well as any filter/speedlane/profile rules.

My routes currently show:

1 LAN to WAN Proxy ARP 24/7 LAN->WAN Any Any->Any Any 81.187.230.1
Proxy ARP

2 WAN to LAN Proxy ARP 24/7 WAN->LAN Any Any->Any Any 81.187.230.3-30
Proxy ARP

7 Gateway 24/7 Any->WAN Any Any->Any 81.187.230.1 Default

My subnets show:

1 LAN 24/7 LAN 81.187.230.2/27 81.187.230.14-24 Network
81.187.230.0-31, Netmask 255.255.255.224, 32 addresses

2 WAN 24/7 WAN 81.187.230.2/27 Network 81.187.230.0-31, Netmask
255.255.255.224, 32 addresses

Gateway is set as 81.187.230.1 WAN(ANY)

I want to keep 81.187.230.x as my LAN, change the firebrick to .1 and
use a different netblock (already allocated) for the WAN side of the
firebrick.

In what order should I make changes (gateway, routes or subnets) and how
do I put the default routing back in there that appears when I reset the
firebrick (shows something to do with "subnets", if I remember
correctly)?

FB105 with latest firmware.
--
David Mahon