[pauldodman]

Right, I think if that is what you are basically doing, then you need to remove the if statements that are in the billing section.

{if $_userinfo.default_fields.s_address}
		<TR>
			<TD>{$lng.lbl_address}: </TD>
			<TD>{$order.s_address}
{$order.s_address_2}</TD>
		</TR>
{/if}

Because of the if statements around here, you are getting nothing.
I reckon if you lose them, and change the s to b, you should get the value displayed.

		<TR>
			<TD>{$lng.lbl_address}: </TD>
			<TD>{$order.b_address}
{$order.s_address_2}</TD>
		</TR>