I say either buy the Riv or buy the bike your custom guy is selling. Don't try to mix the two. If you trust your custom guy then tell him what you want the bike to do and sit back and let it happen. If you don't trust your builder to get it 100% right you need a different builder.

All the best,

Dave