Splitting them in two different features does not introduce any big complexity. If you deploy your layouts first, your 2nd feature can simple refer to them. However, from your file it seems you are trying to deploy a copy of your layout as your site page in your 2nd site collection? Site pages are not copies of layouts, they merely refer to them.
Here is how to deploy a site page that will use an existing layout:
<File Url="MyHomePage.aspx" Type="GhostableInLibrary">
<Property Name="Title" Value="HomePage Title" />
<Property Name="PublishingPageLayout" Value="~SiteCollection/_catalogs/masterpage/OneColumn.aspx, One Column Layout" />
<Property Name="ContentType" Value="$Resources:cmscore,contenttype_enterprisewiki_name;" />
</File>
Edit the ContentType property to match whatever you associated your layout with. To deploy the layout itself you should have used:
<File Url="OneColumn.aspx" Type="GhostableInLibrary" IgnoreIfAlreadyExists="TRUE">
<Property Name="Title" Value="One Column Layout" />
<Property Name="UIVersion" Value="4" />
<Property Name="ContentType" Value="$Resources:cmscore,contenttype_pagelayout_name;" />
<Property Name="PublishingPreviewImage" Value="$PublishingPreviewImage$" />
<Property Name="PublishingAssociatedContentType" Value=";#$Resources:cmscore,contenttype_enterprisewiki_name;;#0x010100C568DB52D9D0A14D9B2FDCC96666E9F2007948130EC3DB064584E219954237AF39004C1F8B46085B4d22B1CDC3DE08CFFB9C;#"/>
</File>
Again adjusting the PublishingAssociatedContentType to the same CT as the ContentType property in the previous block.
One caveat to remember:
- Since layouts are always deployed in the site collection root's _catalogs/masterpage gallery (even if you try to activate them in a subsite), they must be associated with a content type also at the root level. If not, it will deploy but will be unusable (will not have a valid CT association)
Finally, your site page itself (in your package) doesn't have to contain much. This should do it:
<%@ Page Inherits="Microsoft.SharePoint.Publishing.TemplateRedirectionPage,Microsoft.SharePoint.Publishing,Version=14.0.0.0,Culture=neutral,PublicKeyToken=71e9bce111e9429c" %>
<%@ Reference VirtualPath="~TemplatePageUrl" %>
<%@ Reference VirtualPath="~masterurl/custom.master" %>