Sounds like the 05 RX1 fits the bill Skunky. You'll just have to get used to more power and better reliabilty though. Might be a tough transition though,I might stick with an F6 or F7.
Yeah, Skunk, believe it or not, you can go ridin on a Yamy without doing the 200 point Cat checklist. Don't get me wrong, when you buy your RX I would still check. It's not a bad idea.