172 to Citabria-not a problem and no time to get used to it (flight forces, anyway).
The worst though, is if you are used to the Cessna-like flight control forces and you go to something with really light controls. It takes a bit because you want to over-control. I now have 90 hours on my experimental and still have to land with the elevator trim friction locked, or, if in the case that I bounce, I get into PIO because of the extremely light flight controls. I have the same rule, however, that I adopted with the Citabria-2 bounces is an automatic go-around, period.
Yokes are much better for x-country, unless like on my Tailwind, you have a bungee-type trim system. It is really a nice set-up. I can trim it up hands-off and rudder fly the thing all day long. When my hand is on the stick, I just have to think about where I am going and it does it.
Isn't the Diamond a side-stick? That would be a lot easier if controls are light as you have a place to rest your arm.
Wittmandriver