Here's one option for optional $-substitution in templates.

Make [plain] and [html] templates work exactly as before: no
$-substitution.
Add support for [plain$] and [html$] templates that do include
$-substitution.

How does that sound?

David