Starting with OpenBSD 4.3, you can split pf.conf into parts and include subsets:
include /etc/pf/subseta.rules include /etc/pf/subsetb.rules
Split any way you like, as long as the sum of all parts is valid, you're good.