No, don’t freak out. The new handpicked rule works great.
Just one little change that I made; when you go to add an item to an existing hp rule you loose the existing webskin selections.
My fix is below, which I use on the 6.x rule as well:
<cfelseif isvalid("uuid",joinItems[i])>
<cfset thisobject = joinItems[i] />
<cfset thiswebskin = "" />
<!--- webolution webskin fix --->
<cftry>
<cfquery datasource="#application.dsn#" name="wk">
SELECT webskin
from ruleHandpicked_aObjects
WHERE parentid='#stObject.objectid#' AND seq=#i#
</cfquery>
<cfset thiswebskin=wk.webskin>
<cfcatch></cfcatch>
</cftry>
<!--- webolution webskin fix END --->
<cfset thistypename = application.fapi.findType(thisobject) />
</cfif>