Need your help to pimp my ride!!

I have a late 90's OZ 16, have been sailing around a year. Boat is stock but in good condition with Solid mast (not comptip) integrated jib traveller, rudders area white & have a CPR sticker, Haiwain style righting line
I am going to keep the boat for a while so next yeat I was planning to do a repaint and some upgrades
I sail only in the ocean typically 8-20knt winds with some waves/swell with regular crew..mostly day trips round the islands
There is no class racing here only some low key fun club racing against all sorts of other so I can do whatever I like.. was thinking..

1.Fat head sail set along the lines of Whirlwind X2
2.Euro Spinaker kit
3.Telescopic tiler extension
4.Repaint and Expoxy the frame
5. Some form of storage for drinks, lunch

What other mods would you suggest?

By the time you get done with all that you will have more money in the boat than you spent for it. I would say that it about as pimped as a H16 can get.

Curb feelers, and some chrome trim <img src="http://www.catsailor.com/forums/images/graemlins/tongue.gif" alt="" />

ooooh. and some dubs w/ spinners <img src="http://www.catsailor.com/forums/images/graemlins/grin.gif" alt="" />